Skip to content

O
opencv
Commit 840baa22 authored by Andrey Morozov's avatar Andrey Morozov
Browse files
Options

improved build of installer package for windows

parent e722cb96
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
CMakeLists.txt
View file @ 840baa22
...@@ -1317,8 +1317,8 @@ if(BUILD_PACKAGE) ...@@ -1317,8 +1317,8 @@ if(BUILD_PACKAGE)
endif() endif()
install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE) install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
install(DIRECTORY 3rdparty android modules tests DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE) install(DIRECTORY 3rdparty android modules tests doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
#install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex") #install(DIRECTORY doc DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.rst" "*.tex")
#install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE) #install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
#install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE) #install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
......
OpenCVModule.cmake
View file @ 840baa22
...@@ -161,9 +161,9 @@ macro(define_opencv_module name) ...@@ -161,9 +161,9 @@ macro(define_opencv_module name)
get_target_property(LOC ${the_target} LOCATION) get_target_property(LOC ${the_target} LOCATION)
add_test(${the_target} "${LOC}") add_test(${the_target} "${LOC}")
if(WIN32) #if(WIN32)
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) # install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
endif() #endif()
endif() endif()
endmacro() endmacro()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment