kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add correct flags for msvc generators

This commit is contained in:
Bill Hoffman 2006-04-10 13:46:37 -04:00
parent bad1215a85
commit 51f91db648
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/CMakeVS6FindMake.cmake
View File

@ -7,3 +7,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
"/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin" "/Program Files/Microsoft Visual Studio/Common/MSDev98/Bin"
) )
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC60 1)

1
Modules/CMakeVS71FindMake.cmake
View File

@ -8,3 +8,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
"/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/"
) )
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC71 1)

1
Modules/CMakeVS7FindMake.cmake
View File

@ -7,3 +7,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
"/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/"
) )
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC70 1)

1
Modules/CMakeVS8FindMake.cmake
View File

@ -12,3 +12,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
"/Program Files/Microsoft Visual Studio 8/Common7/IDE/" "/Program Files/Microsoft Visual Studio 8/Common7/IDE/"
) )
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC80 1)

23
Modules/InstallRequiredSystemLibraries.cmake
View File

@ -3,22 +3,7 @@
# not complete because it is used only for the release process by the # not complete because it is used only for the release process by the
# developers. # developers.
IF(MSVC) IF(MSVC)
STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") FILE(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" 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")
IF(MSVC70) IF(MSVC70)
SET(__install__libs SET(__install__libs
"${SYSTEMROOT}/system32/msvcp70.dll" "${SYSTEMROOT}/system32/msvcp70.dll"
@ -39,17 +24,17 @@ IF(MSVC)
ENDIF(MSVC80) ENDIF(MSVC80)
IF(CMAKE_INSTALL_MFC_LIBRARIES) IF(CMAKE_INSTALL_MFC_LIBRARIES)
IF(MSVC70) IF(MSVC70)
SET(__install__libs SET(__install__libs ${__install__libs}
"${SYSTEMROOT}/system32/mfc70.dll" "${SYSTEMROOT}/system32/mfc70.dll"
) )
ENDIF(MSVC70) ENDIF(MSVC70)
IF(MSVC71) IF(MSVC71)
SET(__install__libs SET(__install__libs ${__install__libs}
"${SYSTEMROOT}/system32/mfc71.dll" "${SYSTEMROOT}/system32/mfc71.dll"
) )
ENDIF(MSVC71) ENDIF(MSVC71)
IF(MSVC80) IF(MSVC80)
SET(__install__libs SET(__install__libs ${__install__libs}
"${SYSTEMROOT}/system32/mfc80.dll" "${SYSTEMROOT}/system32/mfc80.dll"
) )
ENDIF(MSVC80) ENDIF(MSVC80)