diff options
| author | Brad King <brad.king@kitware.com> | 2007-03-10 12:37:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-03-10 12:37:42 (GMT) |
| commit | 007fa79037970b5624c102f296a23122500deea3 (patch) | |
| tree | a0ac8fb2872bfd05a77c577fd2b84b06ce7c9377 /Modules | |
| parent | 01a27cb5b4141f70207627408e2a8329aba8cbcb (diff) | |
| download | CMake-007fa79037970b5624c102f296a23122500deea3.zip CMake-007fa79037970b5624c102f296a23122500deea3.tar.gz CMake-007fa79037970b5624c102f296a23122500deea3.tar.bz2 | |
BUG: Fixed MSVC8 module build rule to not use /implib option. This is an incremental fix for bug#4210.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 22de1c3..94cb64d 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -205,21 +205,25 @@ ENDIF(CMAKE_FORCE_WIN64) # default to Debug builds IF(MSVC80) + # 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_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=${CMAKE_CL_NOLOGO} -P \"${CMAKE_ROOT}/Modules/CMakeVCManifest.cmake\"" - ) - SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") + ${CMAKE_CREATE_LIB_MANIFEST}) + SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}" + ${CMAKE_CREATE_LIB_MANIFEST}) # 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_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}" - "$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=${CMAKE_CL_NOLOGO} -P \"${CMAKE_ROOT}/Modules/CMakeVCManifestExe.cmake\"" - ) + ${CMAKE_CREATE_EXE_MANIFEST}) SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE}" - "$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=${CMAKE_CL_NOLOGO} -P \"${CMAKE_ROOT}/Modules/CMakeVCManifestExe.cmake\"" - ) + ${CMAKE_CREATE_EXE_MANIFEST}) SET(CMAKE_BUILD_TYPE_INIT Debug) SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR") |