senaduka/old-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-basic'

Browse Source
This commit is contained in:
Amine B. Hassouna
2020-02-23 18:04:28 +01:00
parent 74002ad24e 7aa6e1e448
commit 6acf50ae4f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/sdl2/FindSDL2.cmake
View File

@@ -237,7 +237,7 @@ endif()
# But for non-OSX systems, I will use the CMake Threads package. # But for non-OSX systems, I will use the CMake Threads package.
if(NOT APPLE) if(NOT APPLE)
find_package(Threads QUIET) find_package(Threads QUIET)
if(NOT CMAKE_THREAD_LIBS_INIT) if(NOT Threads_FOUND)
set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).") set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
if(SDL2_FIND_REQUIRED) if(SDL2_FIND_REQUIRED)
message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND}) message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
@@ -274,7 +274,7 @@ if(SDL2_LIBRARY)
# So I use a temporary variable until the end so I can set the # So I use a temporary variable until the end so I can set the
# "real" variable in one-shot. # "real" variable in one-shot.
if(APPLE) if(APPLE)
set(SDL2_LIBRARIES ${SDL2_LIBRARIES} "-framework Cocoa") set(SDL2_LIBRARIES ${SDL2_LIBRARIES} -framework Cocoa)
endif() endif()
# For threads, as mentioned Apple doesn't need this. # For threads, as mentioned Apple doesn't need this.
@@ -343,7 +343,7 @@ if(SDL2_FOUND)
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
# For more details, please see above. # For more details, please see above.
set_property(TARGET SDL2::Core APPEND PROPERTY set_property(TARGET SDL2::Core APPEND PROPERTY
INTERFACE_LINK_OPTIONS "-framework Cocoa") INTERFACE_LINK_OPTIONS -framework Cocoa)
else() else()
# For threads, as mentioned Apple doesn't need this. # For threads, as mentioned Apple doesn't need this.
# For more details, please see above. # For more details, please see above.