diff options
| -rw-r--r-- | Modules/CMakeDetermineCompilerABI.cmake | 3 | ||||
| -rw-r--r-- | Modules/CMakeTestCXXCompiler.cmake | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index 012a87c..87218d2 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -39,6 +39,9 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) endif() set(CMAKE_${lang}_RUNTIME_LIBRARY "Static") endif() + if(lang STREQUAL "CXX") + set(CMAKE_${lang}_SCAN_FOR_MODULES OFF) + endif() if(NOT "x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xMSVC") # Avoid adding our own platform standard libraries for compilers # from which we might detect implicit link libraries. diff --git a/Modules/CMakeTestCXXCompiler.cmake b/Modules/CMakeTestCXXCompiler.cmake index e640ff9..a9fbb26 100644 --- a/Modules/CMakeTestCXXCompiler.cmake +++ b/Modules/CMakeTestCXXCompiler.cmake @@ -37,6 +37,13 @@ endif() # any makefiles or projects. if(NOT CMAKE_CXX_COMPILER_WORKS) PrintTestCompilerStatus("CXX") + # FIXME: Use a block() to isolate the variables we set/unset here. + if(DEFINED CMAKE_CXX_SCAN_FOR_MODULES) + set(__CMAKE_SAVED_CXX_SCAN_FOR_MODULES "${CMAKE_CXX_SCAN_FOR_MODULES}") + else() + unset(__CMAKE_SAVED_CXX_SCAN_FOR_MODULES) + endif() + set(CMAKE_CXX_SCAN_FOR_MODULES OFF) __TestCompiler_setTryCompileTargetType() string(CONCAT __TestCompiler_testCXXCompilerSource "#ifndef __cplusplus\n" @@ -49,6 +56,12 @@ if(NOT CMAKE_CXX_COMPILER_WORKS) try_compile(CMAKE_CXX_COMPILER_WORKS SOURCE_FROM_VAR testCXXCompiler.cxx __TestCompiler_testCXXCompilerSource OUTPUT_VARIABLE __CMAKE_CXX_COMPILER_OUTPUT) + if(DEFINED __CMAKE_SAVED_CXX_SCAN_FOR_MODULES) + set(CMAKE_CXX_SCAN_FOR_MODULES "${__CMAKE_SAVED_CXX_SCAN_FOR_MODULES}") + unset(__CMAKE_SAVED_CXX_SCAN_FOR_MODULES) + else() + unset(CMAKE_CXX_SCAN_FOR_MODULES) + endif() unset(__TestCompiler_testCXXCompilerSource) # Move result from cache to normal variable. set(CMAKE_CXX_COMPILER_WORKS ${CMAKE_CXX_COMPILER_WORKS}) |