Compare commits

...
This repository has been archived on 2021-01-10. You can view files and clone it, but cannot push or open issues or pull requests.

4 Commits

Author SHA1 Message Date
f12dd8f3c3
Name mismatch enabled only for CMake version 3.19.2+ 2021-01-10 12:45:29 +01:00
tseiler
92d390139b Fix for name mismatched cmake warning. 2020-07-25 18:05:28 -04:00
Teybeo
ad006a3daa
Fix quotes around -framework Cocoa (#1)
On OSX 10.12.6, removing the quotes is needed for cmake to correctly parse the argument
2020-02-23 15:59:39 +01:00
Ryan Pavlik
0bd2da935b
Fix Windows target (Threads package checking) (#2) 2020-02-23 15:31:52 +01:00

View File

@ -237,7 +237,7 @@ endif()
# But for non-OSX systems, I will use the CMake Threads package.
if(NOT APPLE)
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).")
if(SDL2_FIND_REQUIRED)
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
# "real" variable in one-shot.
if(APPLE)
set(SDL2_LIBRARIES ${SDL2_LIBRARIES} "-framework Cocoa")
set(SDL2_LIBRARIES ${SDL2_LIBRARIES} -framework Cocoa)
endif()
# For threads, as mentioned Apple doesn't need this.
@ -315,9 +315,16 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
VERSION_VAR SDL2_VERSION_STRING)
if(SDL2MAIN_LIBRARY)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
VERSION_VAR SDL2_VERSION_STRING)
if(${CMAKE_VERSION} VERSION_LESS "3.19.2")
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
VERSION_VAR SDL2_VERSION_STRING)
else()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
VERSION_VAR SDL2_VERSION_STRING
NAME_MISMATCHED)
endif()
endif()
@ -343,7 +350,7 @@ if(SDL2_FOUND)
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
# For more details, please see above.
set_property(TARGET SDL2::Core APPEND PROPERTY
INTERFACE_LINK_OPTIONS "-framework Cocoa")
INTERFACE_LINK_OPTIONS -framework Cocoa)
else()
# For threads, as mentioned Apple doesn't need this.
# For more details, please see above.