diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-05-18 14:32:22 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-05-18 14:32:22 (GMT) |
| commit | 891f2130cf27fdf965367cb2f37f0b1f068fadee (patch) | |
| tree | 3d9562981ca84fe97f93da649a656056a49a5e68 | |
| parent | 9bfb3cacbb154733e1cd31fa27e31d812fa26dc9 (diff) | |
| download | CMake-891f2130cf27fdf965367cb2f37f0b1f068fadee.zip CMake-891f2130cf27fdf965367cb2f37f0b1f068fadee.tar.gz CMake-891f2130cf27fdf965367cb2f37f0b1f068fadee.tar.bz2 | |
COMP: fix link rules with nmake, the linker command has to be converted to shortpath form for nmake
Alex
| -rw-r--r-- | Modules/Platform/cl.cmake | 4 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Modules/Platform/cl.cmake b/Modules/Platform/cl.cmake index 9ab3b00..b578ab2 100644 --- a/Modules/Platform/cl.cmake +++ b/Modules/Platform/cl.cmake @@ -9,7 +9,7 @@ ELSE(CMAKE_VERBOSE_MAKEFILE) ENDIF(CMAKE_VERBOSE_MAKEFILE) # create a shared C++ library SET(CMAKE_CXX_CREATE_SHARED_LIBRARY - "${CMAKE_LINKER} ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}") + "<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}") SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) # create a C shared library @@ -19,7 +19,7 @@ SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") # create a C++ static library -SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_LINKER} /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ") +SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ") # create a C static library SET(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_CXX_CREATE_STATIC_LIBRARY}") diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c7c727b..fce1dcd 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -776,6 +776,7 @@ static const char* ruleReplaceVars[] = "CMAKE_CURRENT_SOURCE_DIR", "CMAKE_CURRENT_BINARY_DIR", "CMAKE_RANLIB", + "CMAKE_LINKER", 0 }; |