Commit e1a472b12f564e2f33d663c80c818aecd5e86b16
1 parent
7e5e9293
minor documentation and packaging improvements
Showing
2 changed files
with
11 additions
and
4 deletions
sdk/openbr_export.cpp
| ... | ... | @@ -32,7 +32,6 @@ |
| 32 | 32 | |
| 33 | 33 | /*! |
| 34 | 34 | * \page installation Installation |
| 35 | - * \brief Guide to installing OpenBR | |
| 36 | 35 | * |
| 37 | 36 | * \section installation_from_source From Source |
| 38 | 37 | * Installation from source is the recommended method for getting OpenBR on your machine. |
| ... | ... | @@ -182,7 +181,7 @@ $ br -help |
| 182 | 181 | * $ cd C:\openbr |
| 183 | 182 | * $ mkdir build-mingw64 |
| 184 | 183 | * $ cd build-mingw64 |
| 185 | - * $ cmake -G "MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D OpenCV_DIR="C:/OpenCV-2.4.3-mingw64/build" -D QT_QMAKE_EXECUTABLE="C:/qt-everywhere-opensource-src-4.8.4/bin/qmake" .. | |
| 184 | + * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D OpenCV_DIR="C:/OpenCV-2.4.3-mingw64/build" -D QT_QMAKE_EXECUTABLE="C:/qt-everywhere-opensource-src-4.8.4/bin/qmake" .. | |
| 186 | 185 | * $ mingw32-make |
| 187 | 186 | * \endcode |
| 188 | 187 | * -# To package OpenBR: | ... | ... |
share/openbr/cmake/InstallDependencies.cmake
| ... | ... | @@ -5,9 +5,17 @@ function(install_opencv_library lib) |
| 5 | 5 | if(${BR_INSTALL_DEPENDENCIES}) |
| 6 | 6 | if(CMAKE_HOST_WIN32) |
| 7 | 7 | if(MSVC) |
| 8 | - install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) | |
| 8 | + if(${CMAKE_BUILD_TYPE} EQUAL "Debug") | |
| 9 | + install(FILES ${OpenCV_DIR}/bin/Debug/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin) | |
| 10 | + else() | |
| 11 | + install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) | |
| 12 | + endif() | |
| 9 | 13 | else() |
| 10 | - install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) | |
| 14 | + if(${CMAKE_BUILD_TYPE} EQUAL "Debug") | |
| 15 | + install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin) | |
| 16 | + else() | |
| 17 | + install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) | |
| 18 | + endif() | |
| 11 | 19 | endif() |
| 12 | 20 | elseif(CMAKE_HOST_APPLE) |
| 13 | 21 | set(OpenCV_LIB_DIR "/usr/local/lib") | ... | ... |