bumped version number, added models as external project, removed models as submodule

Josh Klontz
1 parent ccb58450
Showing 4 changed files with 12 additions and 6 deletions
.gitignore
.gitmodules
CMakeLists.txt
share/openbr/models
@@ -10,6 +10,7 @@ data/lfpw
 data/LFW
 build*
 scripts/results
+share/openbr/models
 ### Generic ###
 *.log
-[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
@@ -10,10 +10,10 @@ set(CPACK_PACKAGE_VENDOR &quot;OpenBiometrics&quot;)
 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)
-Subproject commit be38bd854f7a563818f153a15972f8495de7e80b