[cmake-commits] hoffman committed
InstallRequiredSystemLibraries.cmake 1.8 1.9
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Nov 8 20:37:34 EST 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv27377
Modified Files:
InstallRequiredSystemLibraries.cmake
Log Message:
ENH: add ability to use your own install directories
Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- InstallRequiredSystemLibraries.cmake 21 Sep 2007 15:42:12 -0000 1.8
+++ InstallRequiredSystemLibraries.cmake 9 Nov 2007 01:37:32 -0000 1.9
@@ -1,6 +1,10 @@
# By including this file, all files in the CMAKE_INSTALL_DEBUG_LIBRARIES,
# will be installed with INSTALL_PROGRAMS into /bin for WIN32 and /lib
-# for non-win32. If it is the MSVC compiler, then the microsoft run
+# for non-win32. If CMAKE_SKIP_INSTALL_RULES is set to TRUE before including
+# this file, then the INSTALL command is not called. The use can use
+# the variable CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install
+# command and install them into any directory they want.
+# If it is the MSVC compiler, then the microsoft run
# time libraries will be found add automatically added to the
# CMAKE_INSTALL_DEBUG_LIBRARIES, and installed.
# If CMAKE_INSTALL_DEBUG_LIBRARIES is set and it is the MSVC
@@ -118,11 +122,13 @@
# Include system runtime libraries in the installation if any are
# specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS.
IF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
- IF(WIN32)
- INSTALL_PROGRAMS(/bin ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
- ELSE(WIN32)
- INSTALL_PROGRAMS(/lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
- ENDIF(WIN32)
+ IF(NOT CMAKE_SKIP_INSTALL_RULES)
+ IF(WIN32)
+ INSTALL_PROGRAMS(/bin ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
+ ELSE(WIN32)
+ INSTALL_PROGRAMS(/lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
+ ENDIF(WIN32)
+ ENDIF(NOT CMAKE_SKIP_INSTALL_RULES)
ENDIF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
More information about the Cmake-commits
mailing list