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..1f4769d 100644 --- a/sdk/openbr_export.cpp +++ b/sdk/openbr_export.cpp @@ -250,18 +250,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 +296,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 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()); }