Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
ff250565
Commit
ff250565
authored
Jul 20, 2005
by
Bill Hoffman
Browse files
ENH: move flags next to compiler, so if env contains compiler and some flag, they stay together
parent
5bb158f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Modules/CMakeCInformation.cmake
View file @
ff250565
...
...
@@ -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
)
...
...
Modules/CMakeCXXInformation.cmake
View file @
ff250565
...
...
@@ -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
)
...
...
Modules/Platform/Windows-cl.cmake
View file @
ff250565
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment