Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
19b383b1
Commit
19b383b1
authored
Jun 21, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
put TBB into the installation package
parent
79626f08
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
302 deletions
+6
-302
CMakeLists.txt
CMakeLists.txt
+6
-0
OpenCVInstallRequiredSystemLibraries.cmake
OpenCVInstallRequiredSystemLibraries.cmake
+0
-301
Package.cmake.in
Package.cmake.in
+0
-1
No files found.
CMakeLists.txt
View file @
19b383b1
...
...
@@ -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
()
...
...
OpenCVInstallRequiredSystemLibraries.cmake
deleted
100644 → 0
View file @
79626f08
# 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 user 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 and 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.
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
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
)
ENDIF
(
MSVC90
)
IF
(
MSVC10
)
# Find the runtime library redistribution directory.
FIND_PATH
(
MSVC10_REDIST_DIR NAMES
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC100.CRT
PATHS
"[HKEY_LOCAL_MACHINE
\\
SOFTWARE
\\
Microsoft
\\
VisualStudio
\\
10.0;InstallDir]/../../VC/redist"
"
${
base_dir
}
/VC/redist"
)
MARK_AS_ADVANCED
(
MSVC10_REDIST_DIR
)
SET
(
MSVC10_CRT_DIR
"
${
MSVC10_REDIST_DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC100.CRT"
)
# Install the manifest that allows DLLs to be loaded from the
# directory containing the executable.
SET
(
__install__libs
"
${
MSVC10_CRT_DIR
}
/Microsoft.VC100.CRT.manifest"
"
${
MSVC10_CRT_DIR
}
/msvcp100.dll"
"
${
MSVC10_CRT_DIR
}
/msvcr100.dll"
)
IF
(
CMAKE_INSTALL_DEBUG_LIBRARIES
)
SET
(
MSVC10_CRT_DIR
"
${
MSVC10_REDIST_DIR
}
/Debug_NonRedist/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC90.DebugCRT"
)
SET
(
__install__libs
${
__install__libs
}
"
${
MSVC10_CRT_DIR
}
/Microsoft.VC100.DebugCRT.manifest"
"
${
MSVC10_CRT_DIR
}
/msvcp100d.dll"
"
${
MSVC10_CRT_DIR
}
/msvcr100d.dll"
)
ENDIF
(
CMAKE_INSTALL_DEBUG_LIBRARIES
)
ENDIF
(
MSVC10
)
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
)
IF
(
MSVC10
)
IF
(
CMAKE_INSTALL_DEBUG_LIBRARIES
)
SET
(
MSVC10_MFC_DIR
"
${
MSVC10_REDIST_DIR
}
/Debug_NonRedist/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC100.DebugMFC"
)
SET
(
__install__libs
${
__install__libs
}
"
${
MSVC10_MFC_DIR
}
/Microsoft.VC100.DebugMFC.manifest"
"
${
MSVC10_MFC_DIR
}
/mfc100d.dll"
"
${
MSVC10_MFC_DIR
}
/mfc100ud.dll"
"
${
MSVC10_MFC_DIR
}
/mfcm100d.dll"
"
${
MSVC10_MFC_DIR
}
/mfcm100ud.dll"
)
ENDIF
(
CMAKE_INSTALL_DEBUG_LIBRARIES
)
SET
(
MSVC10_MFC_DIR
"
${
MSVC10_REDIST_DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC100.MFC"
)
# Install the manifest that allows DLLs to be loaded from the
# directory containing the executable.
SET
(
__install__libs
${
__install__libs
}
"
${
MSVC10_MFC_DIR
}
/Microsoft.VC100.MFC.manifest"
"
${
MSVC10_MFC_DIR
}
/mfc100.dll"
"
${
MSVC10_MFC_DIR
}
/mfc100u.dll"
"
${
MSVC10_MFC_DIR
}
/mfcm100.dll"
"
${
MSVC10_MFC_DIR
}
/mfcm100u.dll"
)
# include the language dll's for vs10 as well as the actuall dll's
SET
(
MSVC10_MFCLOC_DIR
"
${
MSVC10_REDIST_DIR
}
/
${
CMAKE_MSVC_ARCH
}
/Microsoft.VC100.MFCLOC"
)
# Install the manifest that allows DLLs to be loaded from the
# directory containing the executable.
SET
(
__install__libs
${
__install__libs
}
"
${
MSVC10_MFCLOC_DIR
}
/Microsoft.VC100.MFCLOC.manifest"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100chs.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100cht.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100enu.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100esp.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100deu.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100fra.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100ita.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100jpn.dll"
"
${
MSVC10_MFCLOC_DIR
}
/mfc100kor.dll"
)
ENDIF
(
MSVC10
)
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
)
Package.cmake.in
View file @
19b383b1
...
...
@@ -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")
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
