Created
September 5, 2018 18:03
-
-
Save omajid/2e31ae5262256c275716d9c374dabe20 to your computer and use it in GitHub Desktop.
better support for user-provided CFLAGS, CXXFLAGS and LDFLAGS
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt | |
index 7d804a1e54..717c2718d7 100644 | |
--- a/src/Native/Unix/CMakeLists.txt | |
+++ b/src/Native/Unix/CMakeLists.txt | |
@@ -25,7 +25,6 @@ add_compile_options(-fPIC) | |
add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) | |
add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) | |
add_compile_options(-g) | |
-add_compile_options(-Werror) | |
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) | |
add_compile_options(-Wno-unreachable-code) | |
endif () | |
diff --git a/src/Native/Unix/configure.cmake b/src/Native/Unix/configure.cmake | |
index f4a30ad6cb..f2db68402a 100644 | |
--- a/src/Native/Unix/configure.cmake | |
+++ b/src/Native/Unix/configure.cmake | |
@@ -27,6 +27,12 @@ else () | |
message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.") | |
endif () | |
+ | |
+set (PREVIOUS_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) | |
+set (CMAKE_CXX_FLAGS "") | |
+set (PREVIOUS_CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) | |
+set (CMAKE_C_FLAGS "") | |
+ | |
# We compile with -Werror, so we need to make sure these code fragments compile without warnings. | |
# Older CMake versions (3.8) do not assign the result of their tests, causing unused-value errors | |
# which are not distinguished from the test failing. So no error for that one. | |
@@ -698,6 +704,9 @@ endif() | |
set (CMAKE_REQUIRED_LIBRARIES) | |
+set (CMAKE_CXX_FLAGS "${PREVIOUS_CMAKE_CXX_FLAGS}") | |
+set (CMAKE_C_FLAGS "${PREVIOUS_CMAKE_C_FLAGS}") | |
+ | |
check_c_source_compiles( | |
" | |
#include <sys/inotify.h> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment