From bde98bafaa9ac193b36607b8b9308cb9d7d1ce69 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Mon, 7 Sep 2015 17:59:01 -0400 Subject: [PATCH] bumped version number, added models as external project, removed models as submodule --- .gitignore | 1 + .gitmodules | 3 --- CMakeLists.txt | 13 +++++++++++-- share/openbr/models | 1 - 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 160000 share/openbr/models diff --git a/.gitignore b/.gitignore index f84320cf7..8a0b30357 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ data/lfpw data/LFW build* scripts/results +share/openbr/models ### Generic ### *.log diff --git a/.gitmodules b/.gitmodules index 7ffb52bfe..62baac0ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 75b9cd4c8..94cad78a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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) diff --git a/share/openbr/models b/share/openbr/models deleted file mode 160000 index be38bd854..000000000 --- a/share/openbr/models +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be38bd854f7a563818f153a15972f8495de7e80b