Skip to content

Commit

Permalink
bumped version number, added models as external project, removed mode…
Browse files Browse the repository at this point in the history
…ls as submodule
  • Loading branch information
jklontz committed Sep 7, 2015
1 parent ccb5845 commit bde98ba
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ data/lfpw
data/LFW
build*
scripts/results
share/openbr/models

### Generic ###
*.log
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "share/openbr/models"]
path = share/openbr/models
url = https://github.com/biometrics/openbr-models.git
[submodule "openbr/janus"]
path = openbr/janus
url = https://github.com/biometrics/janus.git
Expand Down
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ set(CPACK_PACKAGE_VENDOR "OpenBiometrics")
set(CPACK_PACKAGE_DESCRIPTION "Open Source Biometric Recognition")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
if(NOT DEFINED CPACK_PACKAGE_VERSION_MAJOR)
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MAJOR 1)
endif()
if(NOT DEFINED CPACK_PACKAGE_VERSION_MINOR)
set(CPACK_PACKAGE_VERSION_MINOR 6)
set(CPACK_PACKAGE_VERSION_MINOR 0)
endif()
if(NOT DEFINED CPACK_PACKAGE_VERSION_PATCH)
set(CPACK_PACKAGE_VERSION_PATCH 0)
Expand Down Expand Up @@ -156,6 +156,15 @@ else()
mark_as_advanced(BR_THIRDPARTY_DIR)
endif()

# Download the models
ExternalProject_Add(models
URL http://github.com/biometrics/openbr/releases/download/v1.0.0/models.tar.gz
URL_MD5 0a7c79226d6629954aa32c835a1007b9
SOURCE_DIR "${PROJECT_SOURCE_DIR}/share/openbr/models"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND "")

# Build the SDK
include_directories(BEFORE .) # Find the local headers first
add_subdirectory(openbr)
Expand Down
1 change: 0 additions & 1 deletion share/openbr/models
Submodule models deleted from be38bd

0 comments on commit bde98ba

Please sign in to comment.