The first attempt to solve the problem with installing OpenMP runtime on Windows...

git-svn-id: https://code.ros.org/svn/opencv/trunk@2125 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 401230cd693dd2ed35e2020b85aedf12baa76143..9e452f08d937e779c54ec0f36f763e9e24d336d3 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -737,10 +737,6 @@ ADD_CUSTOM_TARGET(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")\r
 \r
 \r
-# Make sure the system libraries are also copied when doing an "INSTALL":\r
-# ----------------------------------------------------------------------------\r
-include(InstallRequiredSystemLibraries)\r
-\r
 # ----------------------------------------------------------------------------\r
 #   CPack target\r
 # ----------------------------------------------------------------------------\r

diff --git a/opencv/OpenCVInstallRequiredSystemLibraries.cmake b/opencv/OpenCVInstallRequiredSystemLibraries.cmake
new file mode 100644 (file)
index 0000000..9c9ee91
--- /dev/null
+++ b/opencv/OpenCVInstallRequiredSystemLibraries.cmake
@@ -0,0 +1,235 @@
+# 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 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
+# compiler, then the debug libraries are installed when available.
+# If CMAKE_INSTALL_MFC_LIBRARIES is set then the MFC run time
+# libraries are installed as well as the CRT run time libraries.
+
+IF(MSVC)
+  FILE(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" SYSTEMROOT)
+
+  IF(MSVC70)
+    SET(__install__libs
+      "${SYSTEMROOT}/system32/msvcp70.dll"
+      "${SYSTEMROOT}/system32/msvcr70.dll"
+      )
+  ENDIF(MSVC70)
+
+  IF(MSVC71)
+    SET(__install__libs
+      "${SYSTEMROOT}/system32/msvcp71.dll"
+      "${SYSTEMROOT}/system32/msvcr71.dll"
+      )
+  ENDIF(MSVC71)
+
+  IF(CMAKE_CL_64)
+    SET(CMAKE_MSVC_ARCH amd64)
+  ELSE(CMAKE_CL_64)
+    SET(CMAKE_MSVC_ARCH x86)
+  ENDIF(CMAKE_CL_64)
+
+  GET_FILENAME_COMPONENT(devenv_dir "${CMAKE_MAKE_PROGRAM}" PATH)
+  GET_FILENAME_COMPONENT(base_dir "${devenv_dir}/../.." ABSOLUTE)
+
+  IF(MSVC80)
+    # Find the runtime library redistribution directory.
+    FIND_PATH(MSVC80_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
+      PATHS
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist"
+        "${base_dir}/VC/redist"
+      )
+    MARK_AS_ADVANCED(MSVC80_REDIST_DIR)
+    SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT")
+
+    # Install the manifest that allows DLLs to be loaded from the
+    # directory containing the executable.
+    SET(__install__libs
+      "${MSVC80_CRT_DIR}/Microsoft.VC80.CRT.manifest"
+      "${MSVC80_CRT_DIR}/msvcm80.dll"
+      "${MSVC80_CRT_DIR}/msvcp80.dll"
+      "${MSVC80_CRT_DIR}/msvcr80.dll"
+      )
+
+    IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+      SET(MSVC80_CRT_DIR
+        "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugCRT")
+      SET(__install__libs ${__install__libs}
+        "${MSVC80_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest"
+        "${MSVC80_CRT_DIR}/msvcm80d.dll"
+        "${MSVC80_CRT_DIR}/msvcp80d.dll"
+        "${MSVC80_CRT_DIR}/msvcr80d.dll"
+        )
+    ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+
+  ENDIF(MSVC80)
+
+  IF(MSVC90)
+    # Find the runtime library redistribution directory.
+    FIND_PATH(MSVC90_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
+      PATHS
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]/../../VC/redist"
+        "${base_dir}/VC/redist"
+      )
+    MARK_AS_ADVANCED(MSVC90_REDIST_DIR)
+    SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT")
+
+    # Install the manifest that allows DLLs to be loaded from the
+    # directory containing the executable.
+    SET(__install__libs
+      "${MSVC90_CRT_DIR}/Microsoft.VC90.CRT.manifest"
+      "${MSVC90_CRT_DIR}/msvcm90.dll"
+      "${MSVC90_CRT_DIR}/msvcp90.dll"
+      "${MSVC90_CRT_DIR}/msvcr90.dll"
+      ) 
+    IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+      SET(MSVC90_CRT_DIR
+        "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT")
+      SET(__install__libs ${__install__libs}
+        "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest"
+        "${MSVC90_CRT_DIR}/msvcm90d.dll"
+        "${MSVC90_CRT_DIR}/msvcp90d.dll"
+        "${MSVC90_CRT_DIR}/msvcr90d.dll"
+        )
+    ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+
+    IF(CMAKE_INSTALL_OPENMP_LIBRARIES)      
+      SET(MSVC90_OPENMP_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.OPENMP")
+      SET(__install__libs ${__install__libs}
+        "${MSVC90_OPENMP_DIR}/Microsoft.VC90.OpenMP.manifest"
+        "${MSVC90_OPENMP_DIR}/vcomp90.dll"
+        )
+      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        SET(MSVC90_OPENMP_DIR
+          "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugOPENMP")
+        SET(__install__libs ${__install__libs}
+          "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugOpenMP.manifest"
+          "${MSVC90_CRT_DIR}/vcomp90d.dll"
+          )
+      ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+    ENDIF(CMAKE_INSTALL_OPENMP_LIBRARIES) 
+  ENDIF(MSVC90) 
+
+  IF(CMAKE_INSTALL_MFC_LIBRARIES)
+    IF(MSVC70)
+      SET(__install__libs ${__install__libs}
+        "${SYSTEMROOT}/system32/mfc70.dll"
+        )
+    ENDIF(MSVC70)
+    IF(MSVC71)
+      SET(__install__libs ${__install__libs}
+        "${SYSTEMROOT}/system32/mfc71.dll"
+        )
+    ENDIF(MSVC71)
+    IF(MSVC80)
+      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        SET(MSVC80_MFC_DIR
+          "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugMFC")
+        SET(__install__libs ${__install__libs}
+          "${MSVC80_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest"
+          "${MSVC80_MFC_DIR}/mfc80d.dll"
+          "${MSVC80_MFC_DIR}/mfc80ud.dll"
+          "${MSVC80_MFC_DIR}/mfcm80d.dll"
+          "${MSVC80_MFC_DIR}/mfcm80ud.dll"
+          )
+      ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        
+      SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFC")
+      # Install the manifest that allows DLLs to be loaded from the
+      # directory containing the executable.
+      SET(__install__libs ${__install__libs}
+        "${MSVC80_MFC_DIR}/Microsoft.VC80.MFC.manifest"
+        "${MSVC80_MFC_DIR}/mfc80.dll"
+        "${MSVC80_MFC_DIR}/mfc80u.dll"
+        "${MSVC80_MFC_DIR}/mfcm80.dll"
+        "${MSVC80_MFC_DIR}/mfcm80u.dll"
+        )
+      # include the language dll's for vs8 as well as the actuall dll's
+      SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFCLOC")
+      # Install the manifest that allows DLLs to be loaded from the
+      # directory containing the executable.
+      SET(__install__libs ${__install__libs}
+        "${MSVC80_MFCLOC_DIR}/Microsoft.VC80.MFCLOC.manifest"
+        "${MSVC80_MFCLOC_DIR}/mfc80chs.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80cht.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80enu.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80esp.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80deu.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80fra.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80ita.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80jpn.dll"
+        "${MSVC80_MFCLOC_DIR}/mfc80kor.dll"
+        )
+    ENDIF(MSVC80)
+
+    IF(MSVC90)
+      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        SET(MSVC90_MFC_DIR
+          "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugMFC")
+        SET(__install__libs ${__install__libs}
+          "${MSVC90_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest"
+          "${MSVC90_MFC_DIR}/mfc90d.dll"
+          "${MSVC90_MFC_DIR}/mfc90ud.dll"
+          "${MSVC90_MFC_DIR}/mfcm90d.dll"
+          "${MSVC90_MFC_DIR}/mfcm90ud.dll"
+          )
+      ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        
+      SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFC")
+      # Install the manifest that allows DLLs to be loaded from the
+      # directory containing the executable.
+      SET(__install__libs ${__install__libs}
+        "${MSVC90_MFC_DIR}/Microsoft.VC90.MFC.manifest"
+        "${MSVC90_MFC_DIR}/mfc90.dll"
+        "${MSVC90_MFC_DIR}/mfc90u.dll"
+        "${MSVC90_MFC_DIR}/mfcm90.dll"
+        "${MSVC90_MFC_DIR}/mfcm90u.dll"
+        )
+      # include the language dll's for vs9 as well as the actuall dll's
+      SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFCLOC")
+      # Install the manifest that allows DLLs to be loaded from the
+      # directory containing the executable.
+      SET(__install__libs ${__install__libs}
+        "${MSVC90_MFCLOC_DIR}/Microsoft.VC90.MFCLOC.manifest"
+        "${MSVC90_MFCLOC_DIR}/mfc90chs.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90cht.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90enu.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90esp.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90deu.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90fra.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90ita.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90jpn.dll"
+        "${MSVC90_MFCLOC_DIR}/mfc90kor.dll"
+        )
+    ENDIF(MSVC90)
+
+  ENDIF(CMAKE_INSTALL_MFC_LIBRARIES)
+
+  FOREACH(lib
+      ${__install__libs}
+      )
+    IF(EXISTS ${lib})
+      SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
+        ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
+    ENDIF(EXISTS ${lib})
+  ENDFOREACH(lib)
+ENDIF(MSVC)
+
+# Include system runtime libraries in the installation if any are
+# specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS.
+IF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
+  IF(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP)
+    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_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP)
+ENDIF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)

diff --git a/opencv/Package.cmake.in b/opencv/Package.cmake.in
index 2c621ed1c6fb95302bc7d86b753aba7c4d7e6863..30f35826f33dc2f63e13cc92ce95e7f9e66df6d5 100644 (file)
--- a/opencv/Package.cmake.in
+++ b/opencv/Package.cmake.in
@@ -5,6 +5,8 @@
 #
 
 set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
+set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
+#include(OpenCVInstallRequiredSystemLibraries.cmake)
 include(InstallRequiredSystemLibraries)