diff options
| -rw-r--r-- | Modules/CMakeVS6FindMake.cmake | 1 | ||||
| -rw-r--r-- | Modules/CMakeVS71FindMake.cmake | 1 | ||||
| -rw-r--r-- | Modules/CMakeVS7FindMake.cmake | 1 | ||||
| -rw-r--r-- | Modules/CMakeVS8FindMake.cmake | 1 | ||||
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 23 |
5 files changed, 8 insertions, 19 deletions
diff --git a/Modules/CMakeVS6FindMake.cmake b/Modules/CMakeVS6FindMake.cmake index f73e2724cb..e0719cdee6 100644 --- a/Modules/CMakeVS6FindMake.cmake +++ b/Modules/CMakeVS6FindMake.cmake @@ -7,3 +7,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM "/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) +SET(MSVC60 1) diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake index ef21887bea..666c83dc12 100644 --- a/Modules/CMakeVS71FindMake.cmake +++ b/Modules/CMakeVS71FindMake.cmake @@ -8,3 +8,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) +SET(MSVC71 1) diff --git a/Modules/CMakeVS7FindMake.cmake b/Modules/CMakeVS7FindMake.cmake index a9ef85ef15..2d12267ae2 100644 --- a/Modules/CMakeVS7FindMake.cmake +++ b/Modules/CMakeVS7FindMake.cmake @@ -7,3 +7,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) +SET(MSVC70 1) diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake index 79e464b898..79aa5a83ea 100644 --- a/Modules/CMakeVS8FindMake.cmake +++ b/Modules/CMakeVS8FindMake.cmake @@ -12,3 +12,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM "/Program Files/Microsoft Visual Studio 8/Common7/IDE/" ) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) +SET(MSVC80 1) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 404058d825..8d431bfcd5 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -3,22 +3,7 @@ # not complete because it is used only for the release process by the # developers. IF(MSVC) - STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7") - SET(MSVC70 1) - SET(MSVC71) - SET(MSVC80) - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7") - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7 .NET 2003") - SET(MSVC70) - SET(MSVC71 1) - SET(MSVC80) - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7 .NET 2003") - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(MSVC70) - SET(MSVC71) - SET(MSVC80 1) - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + FILE(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" SYSTEMROOT) IF(MSVC70) SET(__install__libs "${SYSTEMROOT}/system32/msvcp70.dll" @@ -39,17 +24,17 @@ IF(MSVC) ENDIF(MSVC80) IF(CMAKE_INSTALL_MFC_LIBRARIES) IF(MSVC70) - SET(__install__libs + SET(__install__libs ${__install__libs} "${SYSTEMROOT}/system32/mfc70.dll" ) ENDIF(MSVC70) IF(MSVC71) - SET(__install__libs + SET(__install__libs ${__install__libs} "${SYSTEMROOT}/system32/mfc71.dll" ) ENDIF(MSVC71) IF(MSVC80) - SET(__install__libs + SET(__install__libs ${__install__libs} "${SYSTEMROOT}/system32/mfc80.dll" ) ENDIF(MSVC80) |