put TBB into the installation package

19b383b1 · Vadim Pisarevsky · 79626f08 · 19b383b1 · 79626f08 · 19b383b1
Commit 19b383b1 authored Jun 21, 2011 by Vadim Pisarevsky
Showing with 6 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +6 -0

OpenCVInstallRequiredSystemLibraries.cmake OpenCVInstallRequiredSystemLibraries.cmake +0 -0

Package.cmake.in Package.cmake.in +0 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1366,6 +1366,12 @@ if(BUILD_PACKAGE)
        #install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
        #install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)

+        # install TBB dlls
+        if(WIN32 AND HAVE_TBB)
+            string(REGEX REPLACE "/lib" "/bin" TBB_DLL_DIR "${TBB_LIB_DIR}")
+            install(PROGRAMS "${TBB_DLL_DIR}/tbb.dll" DESTINATION bin COMPONENT main)
+            install(PROGRAMS "${TBB_DLL_DIR}/tbb_debug.dll" DESTINATION bin COMPONENT main)
+        endif()
    endif()
 endif()


--- a/OpenCVInstallRequiredSystemLibraries.cmake
+++ b/OpenCVInstallRequiredSystemLibraries.cmake
--- a/Package.cmake.in
+++ b/Package.cmake.in
@@ -10,7 +10,6 @@ endif()
 #if(ENABLE_OPENMP)
 #    set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
 #endif()
-#include(OpenCVInstallRequiredSystemLibraries.cmake)
 include(InstallRequiredSystemLibraries)

 set(CPACK_PACKAGE_NAME "OpenCV")