Simplify how lists are expanded

This commit is contained in:
Chris Thrasher 2022-08-06 23:50:47 -06:00 committed by Lukas Dürrenberger
parent 8384139983
commit 78e532215a
4 changed files with 7 additions and 9 deletions

View File

@ -105,7 +105,7 @@ if(SFML_OS_ANDROID)
endif()
# avoid missing libraries when building SFML for Android with NDK r19c and later
set(CMAKE_FIND_ROOT_PATH "${PROJECT_SOURCE_DIR};${CMAKE_FIND_ROOT_PATH}")
list(PREPEND CMAKE_FIND_ROOT_PATH "${PROJECT_SOURCE_DIR}")
# make sure there's the android library available
if (CMAKE_ANDROID_API LESS 26)

View File

@ -4,12 +4,12 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Main)
# sources
if(SFML_OS_WINDOWS)
set(SRC ${SRC} ${SRCROOT}/MainWin32.cpp)
set(SRC ${SRCROOT}/MainWin32.cpp)
elseif(SFML_OS_IOS)
enable_language(OBJCXX)
set(SRC ${SRC} ${SRCROOT}/MainiOS.mm)
set(SRC ${SRCROOT}/MainiOS.mm)
elseif(SFML_OS_ANDROID)
set(SRC ${SRC} ${SRCROOT}/MainAndroid.cpp)
set(SRC ${SRCROOT}/MainAndroid.cpp)
else()
return()
endif()

View File

@ -29,14 +29,12 @@ set(SRC
# add platform specific sources
if(SFML_OS_WINDOWS)
set(SRC
${SRC}
list(APPEND SRC
${SRCROOT}/Win32/SocketImpl.cpp
${SRCROOT}/Win32/SocketImpl.hpp
)
else()
set(SRC
${SRC}
list(APPEND SRC
${SRCROOT}/Unix/SocketImpl.cpp
${SRCROOT}/Unix/SocketImpl.hpp
)

View File

@ -50,7 +50,7 @@ else()
)
if(SFML_OS_ANDROID)
set(PLATFORM_SRC ${PLATFORM_SRC}
list(APPEND PLATFORM_SRC
${SRCROOT}/Android/Activity.hpp
${SRCROOT}/Android/Activity.cpp
${SRCROOT}/Android/NativeActivity.cpp