diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-20 16:54:12 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-20 16:54:12 (GMT) |
| commit | ff250565a2316b6bd639fba2db1c8180a8f590db (patch) | |
| tree | 912821174e3b05fa2d51532ab115b6ef4b6e81a8 | |
| parent | 5bb158f440b156552c7ad355a725bdfd1576c53f (diff) | |
| download | CMake-ff250565a2316b6bd639fba2db1c8180a8f590db.zip CMake-ff250565a2316b6bd639fba2db1c8180a8f590db.tar.gz CMake-ff250565a2316b6bd639fba2db1c8180a8f590db.tar.bz2 | |
ENH: move flags next to compiler, so if env contains compiler and some flag, they stay together
| -rw-r--r-- | Modules/CMakeCInformation.cmake | 4 | ||||
| -rw-r--r-- | Modules/CMakeCXXInformation.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index 2695b6a..c8d8e06 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -88,12 +88,12 @@ ENDIF(NOT CMAKE_C_CREATE_STATIC_LIBRARY) # compile a C file into an object file IF(NOT CMAKE_C_COMPILE_OBJECT) SET(CMAKE_C_COMPILE_OBJECT - "<CMAKE_C_COMPILER> -o <OBJECT> <FLAGS> -c <SOURCE>") + "<CMAKE_C_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>") ENDIF(NOT CMAKE_C_COMPILE_OBJECT) IF(NOT CMAKE_C_LINK_EXECUTABLE) SET(CMAKE_C_LINK_EXECUTABLE - "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") ENDIF(NOT CMAKE_C_LINK_EXECUTABLE) IF(CMAKE_USER_MAKE_RULES_OVERRIDE) diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index 16a010f..eefc5f8 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -146,12 +146,12 @@ ENDIF(NOT CMAKE_CXX_CREATE_STATIC_LIBRARY) # compile a C++ file into an object file IF(NOT CMAKE_CXX_COMPILE_OBJECT) SET(CMAKE_CXX_COMPILE_OBJECT - "<CMAKE_CXX_COMPILER> -o <OBJECT> <FLAGS> -c <SOURCE>") + "<CMAKE_CXX_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>") ENDIF(NOT CMAKE_CXX_COMPILE_OBJECT) IF(NOT CMAKE_CXX_LINK_EXECUTABLE) SET(CMAKE_CXX_LINK_EXECUTABLE - "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") ENDIF(NOT CMAKE_CXX_LINK_EXECUTABLE) IF(CMAKE_USER_MAKE_RULES_OVERRIDE) diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 3f0126c..a575789 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -25,11 +25,11 @@ SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY}) # compile a C++ file into an object file SET(CMAKE_CXX_COMPILE_OBJECT - "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE} /nologo /TP -DWIN32 /Fo<OBJECT> <FLAGS> -c <SOURCE>${CMAKE_END_TEMP_FILE}") + "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE} <FLAGS> /nologo /TP -DWIN32 /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}") # compile a C file into an object file SET(CMAKE_C_COMPILE_OBJECT - "<CMAKE_C_COMPILER> ${CMAKE_START_TEMP_FILE} /nologo -DWIN32 /Fo<OBJECT> <FLAGS> -c <SOURCE>${CMAKE_END_TEMP_FILE}") + "<CMAKE_C_COMPILER> ${CMAKE_START_TEMP_FILE} <FLAGS> /nologo -DWIN32 /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}") SET(CMAKE_C_LINK_EXECUTABLE |