Commit 0c05af24fc3b7d5b60e8a1002de7aba16b3fbb2c
1 parent
bea9d765
works on OS X
Showing
5 changed files
with
8 additions
and
11 deletions
CMakeLists.txt
| @@ -39,8 +39,6 @@ endif() | @@ -39,8 +39,6 @@ endif() | ||
| 39 | if(WIN32) | 39 | if(WIN32) |
| 40 | configure_file(${BR_SHARE_DIR}/resources.rc.in resources.rc) | 40 | configure_file(${BR_SHARE_DIR}/resources.rc.in resources.rc) |
| 41 | set(BR_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/resources.rc) | 41 | set(BR_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/resources.rc) |
| 42 | -elseif(APPLE) | ||
| 43 | - set(BR_RESOURCES ${NATIVE_ICON}) | ||
| 44 | endif() | 42 | endif() |
| 45 | 43 | ||
| 46 | # Build options | 44 | # Build options |
app/examples/CMakeLists.txt
| @@ -5,5 +5,5 @@ foreach(EXAMPLE ${EXAMPLES}) | @@ -5,5 +5,5 @@ foreach(EXAMPLE ${EXAMPLES}) | ||
| 5 | qt5_use_modules(${EXAMPLE_BASENAME} ${QT_DEPENDENCIES}) | 5 | qt5_use_modules(${EXAMPLE_BASENAME} ${QT_DEPENDENCIES}) |
| 6 | target_link_libraries(${EXAMPLE_BASENAME} openbr ${BR_THIRDPARTY_LIBS}) | 6 | target_link_libraries(${EXAMPLE_BASENAME} openbr ${BR_THIRDPARTY_LIBS}) |
| 7 | install(TARGETS ${EXAMPLE_BASENAME} RUNTIME DESTINATION bin) | 7 | install(TARGETS ${EXAMPLE_BASENAME} RUNTIME DESTINATION bin) |
| 8 | - add_test("${EXAMPLE_BASENAME}_test" ${EXAMPLE_BASENAME}) | 8 | + add_test(NAME ${EXAMPLE_BASENAME}_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${EXAMPLE_BASENAME}) |
| 9 | endforeach() | 9 | endforeach() |
app/openbr-gui/CMakeLists.txt
| @@ -13,7 +13,6 @@ if(NOT ${BR_EMBEDDED}) | @@ -13,7 +13,6 @@ if(NOT ${BR_EMBEDDED}) | ||
| 13 | SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} | 13 | SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} |
| 14 | LINK_INTERFACE_LIBRARIES "") | 14 | LINK_INTERFACE_LIBRARIES "") |
| 15 | target_link_libraries(openbr-gui openbr ${OpenCV_LIBS}) | 15 | target_link_libraries(openbr-gui openbr ${OpenCV_LIBS}) |
| 16 | - add_cppcheck(openbr-gui) | ||
| 17 | 16 | ||
| 18 | install(FILES ${HEADERS} DESTINATION include/openbr-gui) | 17 | install(FILES ${HEADERS} DESTINATION include/openbr-gui) |
| 19 | install(TARGETS openbr-gui RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) | 18 | install(TARGETS openbr-gui RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) |
sdk/openbr_export.cpp
| @@ -250,18 +250,18 @@ $ br -help | @@ -250,18 +250,18 @@ $ br -help | ||
| 250 | * $ cd .. | 250 | * $ cd .. |
| 251 | * $ rm -r cmake-2.8.10.2 | 251 | * $ rm -r cmake-2.8.10.2 |
| 252 | * \endcode | 252 | * \endcode |
| 253 | - * -# <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>. | 253 | + * -# <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>. |
| 254 | * \code | 254 | * \code |
| 255 | * $ cd ~/Downloads | 255 | * $ cd ~/Downloads |
| 256 | - * $ tar -xf OpenCV-2.4.3.tar.bz2 | ||
| 257 | - * $ cd OpenCV-2.4.3 | 256 | + * $ tar -xf OpenCV-2.4.4.tar.bz2 |
| 257 | + * $ cd OpenCV-2.4.4 | ||
| 258 | * $ mkdir build | 258 | * $ mkdir build |
| 259 | * $ cd build | 259 | * $ cd build |
| 260 | - * $ cmake .. | 260 | + * $ cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release .. |
| 261 | * $ make -j4 | 261 | * $ make -j4 |
| 262 | * $ sudo make install | 262 | * $ sudo make install |
| 263 | * $ cd ../.. | 263 | * $ cd ../.. |
| 264 | - * $ rm -r OpenCV-2.4.3 | 264 | + * $ rm -r OpenCV-2.4.4 |
| 265 | * \endcode | 265 | * \endcode |
| 266 | * -# <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. | 266 | * -# <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. |
| 267 | * -# 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>. | 267 | * -# 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 | @@ -296,7 +296,7 @@ $ br -help | ||
| 296 | * $ make package | 296 | * $ make package |
| 297 | * \endcode | 297 | * \endcode |
| 298 | * -# Build OpenBR documentation! | 298 | * -# Build OpenBR documentation! |
| 299 | - * -# <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: | 299 | + * -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.2.src.tar.gz">Download Doxygen 1.8.2</a> and install: |
| 300 | * \code | 300 | * \code |
| 301 | * $ cd ~/Downloads | 301 | * $ cd ~/Downloads |
| 302 | * $ tar -xf doxygen-1.8.2.src.tar.gz | 302 | * $ tar -xf doxygen-1.8.2.src.tar.gz |
sdk/plugins/misc.cpp
| @@ -40,7 +40,7 @@ class OpenTransform : public UntrainableMetaTransform | @@ -40,7 +40,7 @@ class OpenTransform : public UntrainableMetaTransform | ||
| 40 | foreach (const File &file, src.file.split()) { | 40 | foreach (const File &file, src.file.split()) { |
| 41 | QScopedPointer<Format> format(Factory<Format>::make(file)); | 41 | QScopedPointer<Format> format(Factory<Format>::make(file)); |
| 42 | Template t = format->read(); | 42 | Template t = format->read(); |
| 43 | - if (t.isEmpty()) qWarning("Can't open %s", qPrintable(file.flat())); | 43 | + if (t.isEmpty()) qWarning("Can't open %s from %s", qPrintable(file.flat()), qPrintable(QDir::currentPath())); |
| 44 | dst.append(t); | 44 | dst.append(t); |
| 45 | dst.file.append(t.file.localMetadata()); | 45 | dst.file.append(t.file.localMetadata()); |
| 46 | } | 46 | } |