diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-06 20:01:08 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-06 20:01:08 (GMT) |
| commit | 36080b04bbf07fdecdfaf516949f722a65aa9361 (patch) | |
| tree | b00a91ca1ba87081ef4772ab71a3b93ab4285d6c /Modules | |
| parent | f4fb2ca7794bf8babaf2df354c55d30bf57451ff (diff) | |
| download | CMake-36080b04bbf07fdecdfaf516949f722a65aa9361.zip CMake-36080b04bbf07fdecdfaf516949f722a65aa9361.tar.gz CMake-36080b04bbf07fdecdfaf516949f722a65aa9361.tar.bz2 | |
ENH: add support for manifest stuff
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 71ace41..cf4333c 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -147,14 +147,17 @@ ENDIF(CMAKE_GENERATOR MATCHES "NMake Makefiles") # default to Debug builds IF(CMAKE_COMPILER_2005) # for 2005 make sure the manifest is put in the dll with mt - SET(CMAKE_CXX_CREATE_SHARED_LIBRARY - "link ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} /out:<TARGET> /dll <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE};mt /manifest <TARGET>.manifest /outputresource:<TARGET>\;#2") + SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" + "mt /manifest <TARGET>.manifest /outputresource:<TARGET>\;#2") SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") # create a C shared library SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") # create a C shared module just copy the shared library rule SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_LIBRARY}") - + SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}" + "mt /manifest <TARGET>.manifest /outputresource:<TARGET>\;#2") + SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE}" + "mt /manifest <TARGET>.manifest /outputresource:<TARGET>\;#2") SET(CMAKE_BUILD_TYPE_INIT Debug) SET (CMAKE_CXX_FLAGS_INIT "/W3 /Zm1000 /EHsc /GR") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/DWIN32 /D_DEBUG /D_WINDOWS /MDd /Zi /Ob0 /Od /RTC1") |