improved build of installer package for windows

This commit is contained in:
Andrey Morozov
2011-06-17 15:02:10 +00:00
parent e722cb96e7
commit 840baa2205
2 changed files with 55 additions and 55 deletions

View File

@@ -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)

View File

@@ -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()