Remove useless CPACK_*_COMPONENT_INSTALL variables
They don't actually do anything. And even if they did, all components are enabled by default, anyway. (cherry picked from commit 49fe496914cca93f19dd61aa7b1c120037d65282) Conflicts: cmake/OpenCVPackaging.cmake
This commit is contained in:
parent
34ad2e0fa4
commit
1a3273a7e3
@ -96,15 +96,6 @@ if(NOT OPENCV_CUSTOM_PACKAGE_INFO)
|
|||||||
set(CPACK_COMPONENT_tests_DESCRIPTION "Accuracy and performance tests for Open Source Computer Vision Library")
|
set(CPACK_COMPONENT_tests_DESCRIPTION "Accuracy and performance tests for Open Source Computer Vision Library")
|
||||||
endif(NOT OPENCV_CUSTOM_PACKAGE_INFO)
|
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)
|
include(CPack)
|
||||||
|
|
||||||
ENDif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
|
ENDif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
|
Loading…
x
Reference in New Issue
Block a user