generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated installation package for Windows

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-25 23:12:37 +00:00
parent 73d4d5d4af
commit 40e1fd5b1e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1166,19 +1166,19 @@ if(BUILD_PACKAGE)
) )
if(CMAKE_INSTALL_DEBUG_LIBRARIES) if(CMAKE_INSTALL_DEBUG_LIBRARIES)
foreach(m cxcore cv cvaux ml highgui opencv_ffmpeg) foreach(m calib3d core contrib features2d ffmpeg flann gpu highgui imgproc legacy ml objdetect video)
install(FILES ${CMAKE_BINARY_DIR}/bin/Debug/${m}${OPENCV_DLLVERSION}d.dll install(FILES ${CMAKE_BINARY_DIR}/bin/Debug/opencv_${m}${OPENCV_DLLVERSION}d.dll
DESTINATION bin COMPONENT main) DESTINATION bin COMPONENT main)
install(FILES ${CMAKE_BINARY_DIR}/lib/Debug/${m}${OPENCV_DLLVERSION}d.lib install(FILES ${CMAKE_BINARY_DIR}/lib/Debug/opencv_${m}${OPENCV_DLLVERSION}d.lib
DESTINATION lib COMPONENT main) DESTINATION lib COMPONENT main)
endforeach() endforeach()
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 apps interfaces src tests utils DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE) install(DIRECTORY 3rdparty android modules tests utils 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 "*.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/plastex DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE) install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
endif() endif()
endif() endif()

9
Package.cmake.in
View File

@ -7,11 +7,11 @@
if(MSVC) if(MSVC)
set(CMAKE_INSTALL_DEBUG_LIBRARIES 1) set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
endif() endif()
if(ENABLE_OPENMP) #if(ENABLE_OPENMP)
set(CMAKE_INSTALL_OPENMP_LIBRARIES 1) # set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
endif() #endif()
#include(OpenCVInstallRequiredSystemLibraries.cmake) #include(OpenCVInstallRequiredSystemLibraries.cmake)
#include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_NAME "OpenCV") set(CPACK_PACKAGE_NAME "OpenCV")
set(CPACK_PACKAGE_VENDOR "OpenCV project opencvlibrary.sourceforge.net") set(CPACK_PACKAGE_VENDOR "OpenCV project opencvlibrary.sourceforge.net")
@ -82,6 +82,7 @@ if(WIN32)
"doc\\\\opencv.pdf" "The Reference Manual" "doc\\\\opencv.pdf" "The Reference Manual"
"CMakeLists.txt" "The Build Script (open with CMake)" "CMakeLists.txt" "The Build Script (open with CMake)"
"samples\\\\c" "C Samples" "samples\\\\c" "C Samples"
"samples\\\\cpp" "C++ Samples"
"samples\\\\python" "Python Samples") "samples\\\\python" "Python Samples")
# Add "<install_path>/bin" to the system PATH # Add "<install_path>/bin" to the system PATH