We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix CMake CMAKE_REQUIRED_FLAGS handling to preserve existing CMake flags required by Emscripten toolchain.

0014-Fix-CMake-CMAKE_REQUIRED_FLAGS-handling-to-preserve-ex.txt (text/plain), 3.14 KB, created by Charlie Birks on 2016-04-12 15:16:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Birks

Created: 2016-04-12 15:16:43 UTC

Size: 3.14 KB

patch

obsolete

># HG changeset patch
># User Jukka JylÃ¤nki <jujjyl@gmail.com>
>
>Fix CMake CMAKE_REQUIRED_FLAGS handling to preserve existing CMake flags required by Emscripten toolchain.
>
>---
> CMakeLists.txt        |  2 +-
> cmake/sdlchecks.cmake | 15 +++++++++------
> 2 files changed, 10 insertions(+), 7 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 03bf2fc..db17011 100755
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -203,7 +203,7 @@ set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
> if(CYGWIN)
>   # We build SDL on cygwin without the UNIX emulation layer
>   include_directories("-I/usr/include/mingw")
>-  set(CMAKE_REQUIRED_FLAGS "-mno-cygwin")
>+  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mno-cygwin")
>   check_c_source_compiles("int main(int argc, char **argv) {}"
>     HAVE_GCC_NO_CYGWIN)
>   set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
>diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
>index c4616cc..08b39ee 100644
>--- a/cmake/sdlchecks.cmake
>+++ b/cmake/sdlchecks.cmake
>@@ -766,7 +766,8 @@ macro(CheckPTHREAD)
>     endif()
> 
>     # Run some tests
>-    set(CMAKE_REQUIRED_FLAGS "${PTHREAD_CFLAGS} ${PTHREAD_LDFLAGS}")
>+    set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
>+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LDFLAGS}")
>     if(CMAKE_CROSSCOMPILING)
>       set(HAVE_PTHREADS 1)
>     else()
>@@ -828,7 +829,7 @@ macro(CheckPTHREAD)
>           int main(int argc, char** argv) { return 0; }" HAVE_PTHREAD_NP_H)
>       check_function_exists(pthread_setname_np HAVE_PTHREAD_SETNAME_NP)
>       check_function_exists(pthread_set_name_np HAVE_PTHREAD_SET_NAME_NP)
>-      set(CMAKE_REQUIRED_FLAGS)
>+      set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS}")
> 
>       set(SOURCE_FILES ${SOURCE_FILES}
>           ${SDL2_SOURCE_DIR}/src/thread/pthread/SDL_systhread.c
>@@ -882,7 +883,8 @@ macro(CheckUSBHID)
>     endif()
>   endif()
> 
>-  set(CMAKE_REQUIRED_FLAGS "${USB_CFLAGS}")
>+  set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
>+  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${USB_CFLAGS}")
>   set(CMAKE_REQUIRED_LIBRARIES "${USB_LIBS}")
>   check_c_source_compiles("
>        #include <sys/types.h>
>@@ -983,7 +985,7 @@ macro(CheckUSBHID)
>     set(HAVE_SDL_JOYSTICK TRUE)
> 
>     set(CMAKE_REQUIRED_LIBRARIES)
>-    set(CMAKE_REQUIRED_FLAGS)
>+    set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS}")
>   endif()
> endmacro()
> 
>@@ -997,12 +999,13 @@ macro(CheckRPI)
>     listtostr(VIDEO_RPI_INCLUDE_DIRS VIDEO_RPI_INCLUDE_FLAGS "-I")
>     listtostr(VIDEO_RPI_LIBRARY_DIRS VIDEO_RPI_LIBRARY_FLAGS "-L")
> 
>-    set(CMAKE_REQUIRED_FLAGS "${VIDEO_RPI_INCLUDE_FLAGS} ${VIDEO_RPI_LIBRARY_FLAGS}")
>+    set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
>+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${VIDEO_RPI_INCLUDE_FLAGS} ${VIDEO_RPI_LIBRARY_FLAGS}")
>     set(CMAKE_REQUIRED_LIBRARIES "${VIDEO_RPI_LIBS}")
>     check_c_source_compiles("
>         #include <bcm_host.h>
>         int main(int argc, char **argv) {}" HAVE_VIDEO_RPI)
>-    set(CMAKE_REQUIRED_FLAGS)
>+    set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS}")
>     set(CMAKE_REQUIRED_LIBRARIES)
> 
>     if(SDL_VIDEO AND HAVE_VIDEO_RPI)
>

Actions: View | Diff

Attachments on bug 3229: 2410 | 2411 | 2412 | 2413 | 2414 | 2415 | 2416 | 2417 | 2418 | 2419 | 2420 | 2421 | 2422 | 2423 | 2424 | 2425 | 2426 | 2427 | 2428 | 2429 | 2430 | 2431 | 2432

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.