diff --git a/CMakeLists.txt b/CMakeLists.txt index 8416b14..537bcf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,6 @@ endif() if(WIN32) configure_file(${BR_SHARE_DIR}/resources.rc.in resources.rc) set(BR_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/resources.rc) -elseif(APPLE) - set(BR_RESOURCES ${NATIVE_ICON}) endif() # Build options diff --git a/app/examples/CMakeLists.txt b/app/examples/CMakeLists.txt index ff7be55..1685ae7 100644 --- a/app/examples/CMakeLists.txt +++ b/app/examples/CMakeLists.txt @@ -5,5 +5,5 @@ foreach(EXAMPLE ${EXAMPLES}) qt5_use_modules(${EXAMPLE_BASENAME} ${QT_DEPENDENCIES}) target_link_libraries(${EXAMPLE_BASENAME} openbr ${BR_THIRDPARTY_LIBS}) install(TARGETS ${EXAMPLE_BASENAME} RUNTIME DESTINATION bin) - add_test("${EXAMPLE_BASENAME}_test" ${EXAMPLE_BASENAME}) + add_test(NAME ${EXAMPLE_BASENAME}_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${EXAMPLE_BASENAME}) endforeach() diff --git a/app/openbr-gui/CMakeLists.txt b/app/openbr-gui/CMakeLists.txt index 1d62a5d..3b8c676 100644 --- a/app/openbr-gui/CMakeLists.txt +++ b/app/openbr-gui/CMakeLists.txt @@ -13,7 +13,6 @@ if(NOT ${BR_EMBEDDED}) SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} LINK_INTERFACE_LIBRARIES "") target_link_libraries(openbr-gui openbr ${OpenCV_LIBS}) - add_cppcheck(openbr-gui) install(FILES ${HEADERS} DESTINATION include/openbr-gui) install(TARGETS openbr-gui RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) diff --git a/sdk/openbr_export.cpp b/sdk/openbr_export.cpp index 581c02c..6b50ff8 100644 --- a/sdk/openbr_export.cpp +++ b/sdk/openbr_export.cpp @@ -84,13 +84,12 @@ $ br -help * -# Grab any available Visual Studio Updates. * -# Download CMake 2.8.10.2 and install. * -# During installation setup select "add CMake to PATH". - * -# Download OpenCV 2.4.3 and unarchive. + * -# Download OpenCV 2.4.4. * -# Consider the free open source program 7-Zip if you need a program to unarchive tarballs. - * -# Move the "OpenCV-2.4.3" folder to "C:\". - * -# In "C:\OpenCV-2.4.3\modules\objdetect\src\haar.cpp" line 55, change "#ifdev CV_AVX" to "#ifdef 0". + * -# Move the "OpenCV-2.4.4" folder to "C:\". * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter: * \code - * $ cd C:\OpenCV-2.4.3 + * $ cd C:\OpenCV-2.4.4 * $ mkdir build-msvc2012 * $ cd build-msvc2012 * $ cmake -G "NMake Makefiles" -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_FFMPEG=OFF -D CMAKE_BUILD_TYPE=Debug .. @@ -129,7 +128,7 @@ $ br -help * $ cd C:\openbr * $ mkdir build-msvc2012 * $ cd build-msvc2012 - * $ cmake -G "CodeBlocks - NMake Makefiles" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. + * $ cmake -G "CodeBlocks - NMake Makefiles" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. * $ nmake * $ nmake install * \endcode @@ -164,12 +163,12 @@ $ br -help * -# Move "x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb\mingw64" to "C:\". * -# Download CMake 2.8.10.2 and install. * -# During installation setup select "add CMake to PATH". - * -# Download OpenCV 2.4.3 and unarchive. + * -# Download OpenCV 2.4.4. * -# Consider the free open source program 7-Zip if you need a program to unarchive tarballs. - * -# Move the "OpenCV-2.4.3" folder to "C:\". + * -# Move the "OpenCV-2.4.4" folder to "C:\". * -# From the MinGW-w64 Command Prompt (double-click "C:\mingw64\mingw64env.cmd"): * \code - * $ cd C:\OpenCV-2.4.3 + * $ cd C:\OpenCV-2.4.4 * $ mkdir build-mingw64 * $ cd build-mingw64 * $ cmake -G "MinGW Makefiles" -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_FFMPEG=OFF -D CMAKE_BUILD_TYPE=Debug .. @@ -208,7 +207,7 @@ $ br -help * $ cd C:\openbr * $ mkdir build-mingw64 * $ cd build-mingw64 - * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. + * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. * $ mingw32-make * $ mingw32-make install * \endcode @@ -250,18 +249,18 @@ $ br -help * $ cd .. * $ rm -r cmake-2.8.10.2 * \endcode - * -# Download OpenCV 2.4.3. + * -# Download OpenCV 2.4.4. * \code * $ cd ~/Downloads - * $ tar -xf OpenCV-2.4.3.tar.bz2 - * $ cd OpenCV-2.4.3 + * $ tar -xf OpenCV-2.4.4.tar.bz2 + * $ cd OpenCV-2.4.4 * $ mkdir build * $ cd build - * $ cmake .. + * $ cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release .. * $ make -j4 * $ sudo make install * $ cd ../.. - * $ rm -r OpenCV-2.4.3 + * $ rm -r OpenCV-2.4.4 * \endcode * -# Download Qt 5.0.1 and install. * -# Create a GitHub account, follow their instructions for setting up Git. @@ -296,7 +295,7 @@ $ br -help * $ make package * \endcode * -# Build OpenBR documentation! - * -# Download Doxygen 1.8.3.1 and install: + * -# Download Doxygen 1.8.2 and install: * \code * $ cd ~/Downloads * $ tar -xf doxygen-1.8.2.src.tar.gz @@ -334,18 +333,18 @@ $ br -help * $ cd .. * $ rm -r cmake-2.8.10.2 * \endcode - * -# Download OpenCV 2.4.3. + * -# Download OpenCV 2.4.4. * \code * $ cd ~/Downloads - * $ tar -xf OpenCV-2.4.3.tar.bz2 - * $ cd OpenCV-2.4.3 + * $ tar -xf OpenCV-2.4.4.tar.bz2 + * $ cd OpenCV-2.4.4 * $ mkdir build * $ cd build - * $ cmake -D CMAKE_BUILD_TYPE=Release .. + * $ cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release .. * $ make -j4 * $ sudo make install * $ cd ../.. - * $ rm -r OpenCV-2.4.3 + * $ rm -r OpenCV-2.4.4 * \endcode * -# Download Qt 5.0.1. * \code @@ -401,18 +400,18 @@ $ br -help * $ cd .. * $ rm -r cmake-2.8.10.2 * \endcode - * -# Download OpenCV 2.4.3. + * -# Download OpenCV 2.4.4. * \code * $ cd ~/Downloads - * $ tar -xf OpenCV-2.4.3.tar.bz2 - * $ cd OpenCV-2.4.3 + * $ tar -xf OpenCV-2.4.4.tar.bz2 + * $ cd OpenCV-2.4.4 * $ mkdir build * $ cd build - * $ cmake -D CMAKE_BUILD_TYPE=Release .. + * $ cmake cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release .. * $ make -j4 * $ sudo make install * $ cd ../.. - * $ rm -r OpenCV-2.4.3 + * $ rm -r OpenCV-2.4.4 * \endcode * -# Download Qt 5.0.1. * \code diff --git a/sdk/plugins/misc.cpp b/sdk/plugins/misc.cpp index b7aa5ff..97b30aa 100644 --- a/sdk/plugins/misc.cpp +++ b/sdk/plugins/misc.cpp @@ -40,7 +40,7 @@ class OpenTransform : public UntrainableMetaTransform foreach (const File &file, src.file.split()) { QScopedPointer format(Factory::make(file)); Template t = format->read(); - if (t.isEmpty()) qWarning("Can't open %s", qPrintable(file.flat())); + if (t.isEmpty()) qWarning("Can't open %s from %s", qPrintable(file.flat()), qPrintable(QDir::currentPath())); dst.append(t); dst.file.append(t.file.localMetadata()); }