works on OS X

Josh Klontz
1 parent bea9d765
Showing 5 changed files with 8 additions and 11 deletions
CMakeLists.txt
app/examples/CMakeLists.txt
app/openbr-gui/CMakeLists.txt
sdk/openbr_export.cpp
sdk/plugins/misc.cpp
@@ -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
@@ -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()
@@ -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)
@@ -250,18 +250,18 @@ $ br -help
  * $ cd ..
  * $ rm -r cmake-2.8.10.2
  * \endcode
- * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>.
+ * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
  * \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
  * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-mac-opensource-5.0.1-clang-offline.dmg">Download Qt 5.0.1</a> and install.
  * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>.
@@ -296,7 +296,7 @@ $ br -help
  * $ make package
  * \endcode
  * -# Build OpenBR documentation!
- *  -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.3.1.src.tar.gz">Download Doxygen 1.8.3.1</a> and install:
+ *  -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.2.src.tar.gz">Download Doxygen 1.8.2</a> and install:
  *  \code
  *  $ cd ~/Downloads
  *  $ tar -xf doxygen-1.8.2.src.tar.gz
@@ -40,7 +40,7 @@ class OpenTransform : public UntrainableMetaTransform
         foreach (const File &file, src.file.split()) {
             QScopedPointer<Format> format(Factory<Format>::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());
         }