Commit 4650acf7a45214116cbdb935a961185f994a17d1
Merge branch 'master' of https://github.com/biometrics/openbr
Showing
1 changed file
with
16 additions
and
11 deletions
CMakeLists.txt
| ... | ... | @@ -138,23 +138,28 @@ if(BUILD_TESTING) |
| 138 | 138 | mark_as_advanced(BUILDNAME) |
| 139 | 139 | endif() |
| 140 | 140 | |
| 141 | -# Look for closedbr automatically | |
| 141 | +# Look for extensions to OpenBR | |
| 142 | 142 | set(BR_THIRDPARTY_PLUGINS_DIR CACHE PATH "") |
| 143 | 143 | set(BR_THIRDPARTY_APPS_DIR CACHE PATH "") |
| 144 | 144 | mark_as_advanced(BR_THIRDPARTY_PLUGINS_DIR) |
| 145 | 145 | mark_as_advanced(BR_THIRDPARTY_APPS_DIR) |
| 146 | 146 | |
| 147 | -if(EXISTS "$ENV{CLOSEDBR}" AND IS_DIRECTORY "$ENV{CLOSEDBR}") | |
| 148 | - set(CLOSEDBR_DIR $ENV{CLOSEDBR}) | |
| 147 | +if(BR_THIRDPARTY_DIR) | |
| 148 | + if(EXISTS "${BR_THIRDPARTY_DIR}/test/tests.cmake") | |
| 149 | + include("${BR_THIRDPARTY_DIR}/test/tests.cmake") | |
| 150 | + endif() | |
| 151 | + if(EXISTS "${BR_THIRDPARTY_DIR}/plugins") | |
| 152 | + set(BR_THIRDPARTY_PLUGINS_DIR ${BR_THIRDPARTY_PLUGINS_DIR} "${BR_THIRDPARTY_DIR}/plugins") | |
| 153 | + endif() | |
| 154 | + if(EXISTS "${BR_THIRDPARTY_DIR}/app") | |
| 155 | + set(BR_THIRDPARTY_APPS_DIR ${BR_THIRDPARTY_APPS_DIR} "${BR_THIRDPARTY_DIR}/app") | |
| 156 | + endif() | |
| 157 | + if (EXISTS "${BR_THIRDPARTY_DIR}/share") | |
| 158 | + install(DIRECTORY ${BR_THIRDPARTY_DIR}/share DESTINATION .) | |
| 159 | + endif() | |
| 149 | 160 | else() |
| 150 | - set(CLOSEDBR_DIR "${CMAKE_SOURCE_DIR}/../closedbr") | |
| 151 | -endif() | |
| 152 | -if(EXISTS "${CLOSEDBR_DIR}" AND IS_DIRECTORY "${CLOSEDBR_DIR}") | |
| 153 | - set(CLOSEDBR_DIR "${CLOSEDBR_DIR}" CACHE PATH "Path to ClosedBR") | |
| 154 | - include("${CLOSEDBR_DIR}/test/closedtests.cmake") | |
| 155 | - set(BR_THIRDPARTY_PLUGINS_DIR ${BR_THIRDPARTY_PLUGINS_DIR} "${CLOSEDBR_DIR}/plugins") | |
| 156 | - set(BR_THIRDPARTY_APPS_DIR ${BR_THIRDPARTY_APPS_DIR} "${CLOSEDBR_DIR}/app") | |
| 157 | - install(DIRECTORY ${CLOSEDBR_DIR}/share DESTINATION .) | |
| 161 | + set(BR_THIRDPARTY_DIR "" CACHE PATH "Path to proprietary software") | |
| 162 | + mark_as_advanced(BR_THIRDPARTY_DIR) | |
| 158 | 163 | endif() |
| 159 | 164 | |
| 160 | 165 | # Build the SDK | ... | ... |