diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-01 20:13:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-01 20:13:41 (GMT) |
| commit | b479c6a8a98664c19eeaef40b71850c1f5315601 (patch) | |
| tree | d6bdae61666c26a6872fcc8baecc5d7cdb90ba8c /Modules/Platform/Windows-cl.cmake | |
| parent | 24d6ecd81cf457367c622cd166da5d49f54bf42b (diff) | |
| download | CMake-b479c6a8a98664c19eeaef40b71850c1f5315601.zip CMake-b479c6a8a98664c19eeaef40b71850c1f5315601.tar.gz CMake-b479c6a8a98664c19eeaef40b71850c1f5315601.tar.bz2 | |
ENH: add ability to have manifest files and incremental linking with make and nmake
Diffstat (limited to 'Modules/Platform/Windows-cl.cmake')
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index c9b2822..74ce386 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -167,25 +167,15 @@ ENDIF(CMAKE_FORCE_WIN64) # default to Debug builds IF(MSVC_VERSION GREATER 1310) - # Not used by generator directly but referenced below. - SET(CMAKE_CREATE_LIB_MANIFEST - "$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=${CMAKE_CL_NOLOGO} -P \"${CMAKE_ROOT}/Modules/CMakeVCManifest.cmake\"") - SET(CMAKE_CREATE_EXE_MANIFEST - "$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=${CMAKE_CL_NOLOGO} -P \"${CMAKE_ROOT}/Modules/CMakeVCManifestExe.cmake\"") - # for 2005 make sure the manifest is put in the dll with mt - SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" - ${CMAKE_CREATE_LIB_MANIFEST}) - SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}" - ${CMAKE_CREATE_LIB_MANIFEST}) + SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "$(CMAKE_COMMAND) -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") + SET(CMAKE_CXX_CREATE_SHARED_MODULE "$(CMAKE_COMMAND) -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") # 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_CXX_CREATE_SHARED_MODULE}") - SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}" - ${CMAKE_CREATE_EXE_MANIFEST}) - SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE}" - ${CMAKE_CREATE_EXE_MANIFEST}) + SET(CMAKE_CXX_LINK_EXECUTABLE "$(CMAKE_COMMAND) -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") + SET(CMAKE_C_LINK_EXECUTABLE "$(CMAKE_COMMAND) -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") SET(CMAKE_BUILD_TYPE_INIT Debug) SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR") |