diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-11-21 19:11:53 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-11-21 19:11:53 (GMT) |
| commit | a7098d1433582bb5c8c14c7dcf90053528d8b590 (patch) | |
| tree | aa3a74210eb3a3a4c07bbbe403e24931d33d428e | |
| parent | 02ef2fb568745d34ef3762f0f51178ffab2b0afa (diff) | |
| download | CMake-a7098d1433582bb5c8c14c7dcf90053528d8b590.zip CMake-a7098d1433582bb5c8c14c7dcf90053528d8b590.tar.gz CMake-a7098d1433582bb5c8c14c7dcf90053528d8b590.tar.bz2 | |
move ansi cxx flags stuff out of try compile and into cmake files
| -rw-r--r-- | Modules/CheckIncludeFileCXX.cmake | 1 | ||||
| -rw-r--r-- | Modules/TestForANSIForScope.cmake | 3 | ||||
| -rw-r--r-- | Modules/TestForANSIStreamHeaders.cmake | 3 | ||||
| -rw-r--r-- | Modules/TestForSTDNamespace.cmake | 1 | ||||
| -rw-r--r-- | Source/cmTryCompileCommand.cxx | 14 |
5 files changed, 6 insertions, 16 deletions
diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake index 7295f66..f8ce130 100644 --- a/Modules/CheckIncludeFileCXX.cmake +++ b/Modules/CheckIncludeFileCXX.cmake @@ -13,6 +13,7 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) TRY_COMPILE(${VARIABLE} ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS} OUTPUT_VARIABLE OUTPUT) IF(${VARIABLE}) SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}") diff --git a/Modules/TestForANSIForScope.cmake b/Modules/TestForANSIForScope.cmake index 3265f00..58d78ee 100644 --- a/Modules/TestForANSIForScope.cmake +++ b/Modules/TestForANSIForScope.cmake @@ -7,7 +7,8 @@ IF(NOT CMAKE_ANSI_FOR_SCOPE) MESSAGE(STATUS "Check for ANSI scope") TRY_COMPILE(CMAKE_ANSI_FOR_SCOPE ${PROJECT_BINARY_DIR} - ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx) + ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS}) IF (CMAKE_ANSI_FOR_SCOPE) MESSAGE(STATUS "Check for ANSI scope - found") SET (CMAKE_NO_ANSI_FOR_SCOPE 0 CACHE INTERNAL diff --git a/Modules/TestForANSIStreamHeaders.cmake b/Modules/TestForANSIStreamHeaders.cmake index 7ea1071..74fe831 100644 --- a/Modules/TestForANSIStreamHeaders.cmake +++ b/Modules/TestForANSIStreamHeaders.cmake @@ -7,7 +7,8 @@ IF(NOT CMAKE_NO_ANSI_STREAM_HEADERS) MESSAGE(STATUS "Check for ANSI stream headers") TRY_COMPILE(CMAKE_ANSI_STREAM_HEADERS ${PROJECT_BINARY_DIR} - ${CMAKE_ROOT}/Modules/TestForANSIStreamHeaders.cxx) + ${CMAKE_ROOT}/Modules/TestForANSIStreamHeaders.cxx + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS}) IF (CMAKE_ANSI_STREAM_HEADERS) MESSAGE(STATUS "Check for ANSI stream headers - found") SET (CMAKE_NO_ANSI_STREAM_HEADERS 0 CACHE INTERNAL diff --git a/Modules/TestForSTDNamespace.cmake b/Modules/TestForSTDNamespace.cmake index 9f14558..3fd018b 100644 --- a/Modules/TestForSTDNamespace.cmake +++ b/Modules/TestForSTDNamespace.cmake @@ -7,6 +7,7 @@ IF(NOT CMAKE_STD_NAMESPACE) MESSAGE(STATUS "Check for STD namespace") TRY_COMPILE(CMAKE_STD_NAMESPACE ${PROJECT_BINARY_DIR} + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS} ${CMAKE_ROOT}/Modules/TestForSTDNamespace.cxx) IF (CMAKE_STD_NAMESPACE) MESSAGE(STATUS "Check for STD namespace - found") diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx index b187182..a2c2af8 100644 --- a/Source/cmTryCompileCommand.cxx +++ b/Source/cmTryCompileCommand.cxx @@ -153,20 +153,6 @@ int cmTryCompileCommand::CoreTryCompileCode( return -1; } - if ( format == cmSystemTools::CXX_FILE_FORMAT ) - { - fprintf(fout, "IF (CMAKE_ANSI_CXXFLAGS)\n"); - fprintf(fout, " SET(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS}" - " ${CMAKE_ANSI_CXXFLAGS}\")\n"); - fprintf(fout, "ENDIF (CMAKE_ANSI_CXXFLAGS)\n"); - } - - if ( format == cmSystemTools::C_FILE_FORMAT ) - { - fprintf(fout, "IF (CMAKE_ANSI_CFLAGS)\n"); - fprintf(fout, " SET(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}\")\n"); - fprintf(fout, "ENDIF (CMAKE_ANSI_CFLAGS)\n"); - } fprintf(fout, "ADD_DEFINITIONS(${COMPILE_DEFINITIONS})\n"); fprintf(fout, "INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES})\n"); fprintf(fout, "LINK_DIRECTORIES(${LINK_DIRECTORIES})\n"); |