Jelajahi Sumber

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

Brad King 20 tahun lalu
induk
melakukan
06b6308ab4
2 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 2 2
      Modules/CPack.cmake
  2. 2 2
      Utilities/Release/Release.cmake

+ 2 - 2
Modules/CPack.cmake

@@ -50,7 +50,7 @@ SET(CPACK_BINARY_DIR "${CMAKE_BINARY_DIR}")
 # Search for system runtime libraries based on the platform.  This is
 # not complete because it is used only for the release process by the
 # developers.
-IF(WIN32 AND NOT CYGWIN)
+IF(MSVC)
   STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}")
   FOREACH(lib
       "${SYSTEMROOT}/system32/mfc71.dll"
@@ -62,7 +62,7 @@ IF(WIN32 AND NOT CYGWIN)
         ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
     ENDIF(EXISTS ${lib})
   ENDFOREACH(lib)
-ENDIF(WIN32 AND NOT CYGWIN)
+ENDIF(MSVC)
 
 # Include system runtime libraries in the installation if any are
 # specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS.

+ 2 - 2
Utilities/Release/Release.cmake

@@ -4,7 +4,7 @@
 # Search for system runtime libraries based on the platform.  This is
 # not complete because it is used only for the release process by the
 # developers.
-IF(WIN32 AND NOT CYGWIN)
+IF(MSVC)
   STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}")
   FOREACH(lib
       "${SYSTEMROOT}/system32/mfc71.dll"
@@ -16,7 +16,7 @@ IF(WIN32 AND NOT CYGWIN)
         ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
     ENDIF(EXISTS ${lib})
   ENDFOREACH(lib)
-ENDIF(WIN32 AND NOT CYGWIN)
+ENDIF(MSVC)
 
 # Include system runtime libraries in the installation if any are
 # specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS.