Peter M. Groen / openbr

Commit 759c7ec599918e84c5af0f052e611b19ef17c200

Authored by Josh Klontz
1 parent 7f7c788e

fixes to make openbr build as a submodule/subproject

Inline Side-by-side
Showing 7 changed files with 8 additions and 8 deletions
CMakeLists.txt
  View file @759c7ec
... ... @@ -97,7 +97,7 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OpenCV_LIBS})
97 97 find_package(Alphanum REQUIRED)
98 98  
99 99 # Add RandomLib
100   -set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${CMAKE_SOURCE_DIR}/3rdparty/RandomLib-1.9/src/Random.cpp)
  100 +set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/RandomLib-1.9/src/Random.cpp)
101 101 include_directories(3rdparty/RandomLib-1.9/include)
102 102  
103 103 # Find cvmatio (if using it)
... ...
openbr/plugins/cmake/dlib.cmake
  View file @759c7ec
... ... @@ -4,11 +4,11 @@ if(${BR_WITH_DLIB})
4 4 ExternalProject_Add(dlib
5 5 URL https://github.com/davisking/dlib/releases/download/v18.16/dlib-18.16.tar.bz2
6 6 URL_MD5 e9e5449bc25370afce2d254327afac99
7   - SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/dlib-18.16"
  7 + SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty/dlib-18.16"
8 8 CONFIGURE_COMMAND ""
9 9 BUILD_COMMAND ""
10 10 INSTALL_COMMAND "")
11   - include_directories("${CMAKE_SOURCE_DIR}/3rdparty/dlib-18.16")
  11 + include_directories("${PROJECT_SOURCE_DIR}/3rdparty/dlib-18.16")
12 12 else()
13 13 set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/classification/dlib.cpp)
14 14 endif()
... ...
share/openbr/cmake/FindAlphanum.cmake
  View file @759c7ec
1   -find_path(ALPHANUM_DIR alphanum.hpp ${CMAKE_SOURCE_DIR}/3rdparty/*)
  1 +find_path(ALPHANUM_DIR alphanum.hpp ${PROJECT_SOURCE_DIR}/3rdparty/*)
2 2 mark_as_advanced(ALPHANUM_DIR)
3 3 include_directories(${ALPHANUM_DIR})
... ...
share/openbr/cmake/FindDLib.cmake
  View file @759c7ec
1   -find_path(DLib_DIR dlib ${CMAKE_SOURCE_DIR}/3rdparty/*)
  1 +find_path(DLib_DIR dlib ${PROJECT_SOURCE_DIR}/3rdparty/*)
2 2  
3 3 mark_as_advanced(DLib_DIR)
4 4 include_directories(${DLib_DIR})
... ...
share/openbr/cmake/FindEigen3.cmake
  View file @759c7ec
1   -find_path(EIGEN3_DIR signature_of_eigen3_matrix_library ${CMAKE_SOURCE_DIR}/3rdparty/*)
  1 +find_path(EIGEN3_DIR signature_of_eigen3_matrix_library ${PROJECT_SOURCE_DIR}/3rdparty/*)
2 2 mark_as_advanced(EIGEN3_DIR)
3 3 include_directories(${EIGEN3_DIR})
4 4 set(EIGEN3_LICENSE ${EIGEN3_DIR}/COPYING.LGPL)
... ...
share/openbr/cmake/FindHttpParser.cmake
  View file @759c7ec
1   -find_path(HTTPPARSER_DIR http_parser.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
  1 +find_path(HTTPPARSER_DIR http_parser.h ${PROJECT_SOURCE_DIR}/3rdparty/*)
2 2 mark_as_advanced(HTTPPARSER_DIR)
3 3 include_directories(${HTTPPARSER_DIR})
4 4 set(HTTPPARSER_SRC ${HTTPPARSER_DIR}/http_parser.c)
... ...
share/openbr/cmake/FindStasm4.cmake
  View file @759c7ec
... ... @@ -8,7 +8,7 @@
8 8 # target_link_libraries(MY_TARGET ${Stasm4_LIBS})
9 9 # ================================================================
10 10  
11   -find_path(Stasm_DIR stasm/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/* NO_DEFAULT_PATH)
  11 +find_path(Stasm_DIR stasm/stasm_lib.h ${PROJECT_SOURCE_DIR}/3rdparty/* NO_DEFAULT_PATH)
12 12 mark_as_advanced(Stasm_DIR)
13 13 include_directories(${Stasm_DIR}/stasm)
14 14 include_directories(${Stasm_DIR}/stasm/MOD_1)
... ...