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

BUG: Do not install MSVC dlls for a non-MSVC build.

Browse Source
This commit is contained in:
Brad King 2006-02-16 20:15:03 -05:00
parent 8facf1f406
commit 06b6308ab4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CPack.cmake
View File

@ -50,7 +50,7 @@ SET(CPACK_BINARY_DIR "${CMAKE_BINARY_DIR}")
# Search for system runtime libraries based on the platform. This is # Search for system runtime libraries based on the platform. This is
# 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(WIN32 AND NOT CYGWIN) IF(MSVC)
STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}")
FOREACH(lib FOREACH(lib
"${SYSTEMROOT}/system32/mfc71.dll" "${SYSTEMROOT}/system32/mfc71.dll"
@ -62,7 +62,7 @@ IF(WIN32 AND NOT CYGWIN)
${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib}) ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
ENDIF(EXISTS ${lib}) ENDIF(EXISTS ${lib})
ENDFOREACH(lib) ENDFOREACH(lib)
ENDIF(WIN32 AND NOT CYGWIN) ENDIF(MSVC)
# Include system runtime libraries in the installation if any are # Include system runtime libraries in the installation if any are
# specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS. # specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS.

4
Utilities/Release/Release.cmake
View File

@ -4,7 +4,7 @@
# Search for system runtime libraries based on the platform. This is # Search for system runtime libraries based on the platform. This is
# 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(WIN32 AND NOT CYGWIN) IF(MSVC)
STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}")
FOREACH(lib FOREACH(lib
"${SYSTEMROOT}/system32/mfc71.dll" "${SYSTEMROOT}/system32/mfc71.dll"
@ -16,7 +16,7 @@ IF(WIN32 AND NOT CYGWIN)
${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib}) ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
ENDIF(EXISTS ${lib}) ENDIF(EXISTS ${lib})
ENDFOREACH(lib) ENDFOREACH(lib)
ENDIF(WIN32 AND NOT CYGWIN) ENDIF(MSVC)
# Include system runtime libraries in the installation if any are # Include system runtime libraries in the installation if any are
# specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS. # specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS.