diff --git a/sdk/openbr_export.cpp b/sdk/openbr_export.cpp index f10a5e8..0f8d210 100644 --- a/sdk/openbr_export.cpp +++ b/sdk/openbr_export.cpp @@ -32,7 +32,6 @@ /*! * \page installation Installation - * \brief Guide to installing OpenBR * * \section installation_from_source From Source * Installation from source is the recommended method for getting OpenBR on your machine. @@ -182,7 +181,7 @@ $ br -help * $ cd C:\openbr * $ mkdir build-mingw64 * $ cd build-mingw64 - * $ 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" .. + * $ 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" .. * $ mingw32-make * \endcode * -# To package OpenBR: diff --git a/share/openbr/cmake/InstallDependencies.cmake b/share/openbr/cmake/InstallDependencies.cmake index 44a1dbc..c8217ab 100644 --- a/share/openbr/cmake/InstallDependencies.cmake +++ b/share/openbr/cmake/InstallDependencies.cmake @@ -5,9 +5,17 @@ function(install_opencv_library lib) if(${BR_INSTALL_DEPENDENCIES}) if(CMAKE_HOST_WIN32) if(MSVC) - install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) + if(${CMAKE_BUILD_TYPE} EQUAL "Debug") + install(FILES ${OpenCV_DIR}/bin/Debug/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin) + else() + install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) + endif() else() - install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) + if(${CMAKE_BUILD_TYPE} EQUAL "Debug") + install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin) + else() + install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) + endif() endif() elseif(CMAKE_HOST_APPLE) set(OpenCV_LIB_DIR "/usr/local/lib")