Conflicts: cmake/OpenCVDetectPython.cmake cmake/OpenCVModule.cmake modules/core/src/gpumat.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/CMakeLists.txt modules/gpu/src/cuda/generalized_hough.cu modules/gpu/src/generalized_hough.cpp modules/python/CMakeLists.txtpull/2211/head
Roman Donchenko
11 years ago
commit
bbc35d609d
40 changed files with 247 additions and 141 deletions
@ -0,0 +1,106 @@ |
||||
if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") |
||||
set(CPACK_set_DESTDIR "on") |
||||
|
||||
if(NOT OPENCV_CUSTOM_PACKAGE_INFO) |
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Computer Vision Library") |
||||
set(CPACK_PACKAGE_DESCRIPTION |
||||
"OpenCV (Open Source Computer Vision Library) is an open source computer vision |
||||
and machine learning software library. OpenCV was built to provide a common |
||||
infrastructure for computer vision applications and to accelerate the use of |
||||
machine perception in the commercial products. Being a BSD-licensed product, |
||||
OpenCV makes it easy for businesses to utilize and modify the code.") |
||||
set(CPACK_PACKAGE_VENDOR "OpenCV Foundation") |
||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") |
||||
set(CPACK_PACKAGE_CONTACT "admin@opencv.org") |
||||
set(CPACK_PACKAGE_VERSION_MAJOR "${OPENCV_VERSION_MAJOR}") |
||||
set(CPACK_PACKAGE_VERSION_MINOR "${OPENCV_VERSION_MINOR}") |
||||
set(CPACK_PACKAGE_VERSION_PATCH "${OPENCV_VERSION_PATCH}") |
||||
set(CPACK_PACKAGE_VERSION "${OPENCV_VCSVERSION}") |
||||
endif(NOT OPENCV_CUSTOM_PACKAGE_INFO) |
||||
|
||||
#arch |
||||
if(X86) |
||||
set(CPACK_DEBIAN_ARCHITECTURE "i386") |
||||
set(CPACK_RPM_PACKAGE_ARCHITECTURE "i686") |
||||
elseif(X86_64) |
||||
set(CPACK_DEBIAN_ARCHITECTURE "amd64") |
||||
set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") |
||||
elseif(ARM) |
||||
set(CPACK_DEBIAN_ARCHITECTURE "armhf") |
||||
set(CPACK_RPM_PACKAGE_ARCHITECTURE "armhf") |
||||
else() |
||||
set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) |
||||
set(CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) |
||||
endif() |
||||
|
||||
if(CPACK_GENERATOR STREQUAL "DEB") |
||||
set(OPENCV_PACKAGE_ARCH_SUFFIX ${CPACK_DEBIAN_ARCHITECTURE}) |
||||
elseif(CPACK_GENERATOR STREQUAL "RPM") |
||||
set(OPENCV_PACKAGE_ARCH_SUFFIX ${CPACK_RPM_PACKAGE_ARCHITECTURE}) |
||||
else() |
||||
set(OPENCV_PACKAGE_ARCH_SUFFIX ${CMAKE_SYSTEM_PROCESSOR}) |
||||
endif() |
||||
|
||||
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VCSVERSION}-${OPENCV_PACKAGE_ARCH_SUFFIX}") |
||||
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VCSVERSION}-${OPENCV_PACKAGE_ARCH_SUFFIX}") |
||||
|
||||
#rpm options |
||||
set(CPACK_RPM_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) |
||||
set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION}) |
||||
set(CPACK_RPM_PACKAGE_URL "http://opencv.org") |
||||
set(CPACK_RPM_PACKAGE_LICENSE "BSD") |
||||
|
||||
#deb options |
||||
set(CPACK_DEB_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") |
||||
set(CPACK_DEBIAN_PACKAGE_SECTION "libs") |
||||
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://opencv.org") |
||||
|
||||
#depencencies |
||||
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE) |
||||
set(CPACK_COMPONENT_samples_DEPENDS libs) |
||||
set(CPACK_COMPONENT_dev_DEPENDS libs) |
||||
set(CPACK_COMPONENT_docs_DEPENDS libs) |
||||
set(CPACK_COMPONENT_java_DEPENDS libs) |
||||
set(CPACK_COMPONENT_python_DEPENDS libs) |
||||
|
||||
if(HAVE_CUDA) |
||||
string(REPLACE "." "-" cuda_version_suffix ${CUDA_VERSION}) |
||||
set(CPACK_DEB_libs_PACKAGE_DEPENDS "cuda-core-libs-${cuda_version_suffix}, cuda-extra-libs-${cuda_version_suffix}") |
||||
set(CPACK_COMPONENT_dev_DEPENDS libs) |
||||
set(CPACK_DEB_dev_PACKAGE_DEPENDS "cuda-headers-${cuda_version_suffix}") |
||||
endif() |
||||
|
||||
if(NOT OPENCV_CUSTOM_PACKAGE_INFO) |
||||
set(CPACK_COMPONENT_libs_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}") |
||||
set(CPACK_COMPONENT_libs_DESCRIPTION "Open Computer Vision Library") |
||||
|
||||
set(CPACK_COMPONENT_python_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-python") |
||||
set(CPACK_COMPONENT_python_DESCRIPTION "Python bindings for Open Computer Vision Library") |
||||
|
||||
set(CPACK_COMPONENT_java_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-java") |
||||
set(CPACK_COMPONENT_java_DESCRIPTION "Java bindings for Open Computer Vision Library") |
||||
|
||||
set(CPACK_COMPONENT_dev_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-dev") |
||||
set(CPACK_COMPONENT_dev_DESCRIPTION "Development files for Open Computer Vision Library") |
||||
|
||||
set(CPACK_COMPONENT_docs_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-docs") |
||||
set(CPACK_COMPONENT_docs_DESCRIPTION "Documentation for Open Computer Vision Library") |
||||
|
||||
set(CPACK_COMPONENT_samples_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-samples") |
||||
set(CPACK_COMPONENT_samples_DESCRIPTION "Samples for Open Computer Vision Library") |
||||
endif(NOT OPENCV_CUSTOM_PACKAGE_INFO) |
||||
|
||||
if(NOT OPENCV_CUSTOM_PACKAGE_LAYOUT) |
||||
set(CPACK_libs_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_dev_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_docs_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_python_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_java_COMPONENT_INSTALL TRUE) |
||||
set(CPACK_samples_COMPONENT_INSTALL TRUE) |
||||
endif(NOT OPENCV_CUSTOM_PACKAGE_LAYOUT) |
||||
|
||||
include(CPack) |
||||
|
||||
ENDif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") |
||||
@ -1,37 +0,0 @@ |
||||
IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. |
||||
|
||||
By downloading, copying, installing or using the software you agree to this license. |
||||
If you do not agree to this license, do not download, install, |
||||
copy or use the software. |
||||
|
||||
|
||||
License Agreement |
||||
For Open Source Computer Vision Library |
||||
|
||||
Copyright (C) 2000-2008, Intel Corporation, all rights reserved. |
||||
Copyright (C) 2008-2011, Willow Garage Inc., all rights reserved. |
||||
Third party copyrights are property of their respective owners. |
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, |
||||
are permitted provided that the following conditions are met: |
||||
|
||||
* Redistributions of source code must retain the above copyright notice, |
||||
this list of conditions and the following disclaimer. |
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice, |
||||
this list of conditions and the following disclaimer in the documentation |
||||
and/or other materials provided with the distribution. |
||||
|
||||
* The name of the copyright holders may not be used to endorse or promote products |
||||
derived from this software without specific prior written permission. |
||||
|
||||
This software is provided by the copyright holders and contributors "as is" and |
||||
any express or implied warranties, including, but not limited to, the implied |
||||
warranties of merchantability and fitness for a particular purpose are disclaimed. |
||||
In no event shall the Intel Corporation or contributors be liable for any direct, |
||||
indirect, incidental, special, exemplary, or consequential damages |
||||
(including, but not limited to, procurement of substitute goods or services; |
||||
loss of use, data, or profits; or business interruption) however caused |
||||
and on any theory of liability, whether in contract, strict liability, |
||||
or tort (including negligence or otherwise) arising in any way out of |
||||
the use of this software, even if advised of the possibility of such damage. |
||||
@ -1,7 +1,7 @@ |
||||
file(GLOB old_hdrs "opencv/*.h*") |
||||
install(FILES ${old_hdrs} |
||||
DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv |
||||
COMPONENT main) |
||||
COMPONENT dev) |
||||
install(FILES "opencv2/opencv.hpp" |
||||
DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 |
||||
COMPONENT main) |
||||
COMPONENT dev) |
||||
|
||||
Loading…
Reference in new issue