diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e168176c1981093494e46ccb6c1d493cbdd21a1..e743ef7f0ed9e7c2d08c2a86d0edc2841b38592a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if("Debug" STREQUAL CMAKE_BUILD_TYPE) add_definitions(-D_DEBUG) endif() -OPTION(ENABLE_DOWNLOAD_MODUEL "Enable automation download" OFF) +OPTION(ENABLE_DOWNLOAD_MODUEL "Enable automation download moduel files" OFF) #需要的QT组件 if(CMAKE_VERSION VERSION_LESS "3.7.0") diff --git a/Src/Plugins/OpenCV/OpenCV_DNN.cmake b/Src/Plugins/OpenCV/OpenCV_DNN.cmake index b2dd0c72a0b1752a19d69fd5eed6179fefccc7e7..bfd58a19dc194c84a07e155f4dbc6ace7cffe271 100644 --- a/Src/Plugins/OpenCV/OpenCV_DNN.cmake +++ b/Src/Plugins/OpenCV/OpenCV_DNN.cmake @@ -31,7 +31,7 @@ endif() # Install model files if(NOT EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv") - if(ENABLE_DOWNLOAD) + if(ENABLE_DOWNLOAD_MODUEL) DOWNLOAD(FILENAME "deploy.prototxt" HASH 6e1471d86330a9e7f9f5738318ede387 URL "https://github.com/opencv/opencv/raw/master/samples/dnn/face_detector/" @@ -53,7 +53,7 @@ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv") DESTINATION_DIR "${CMAKE_SOURCE_DIR}/model/Opencv" STATUS RETVAL RELATIVE_URL) else() - message(AUTHOR_WARNING "Please set ENABLE_DOWNLOAD to ON " + message(AUTHOR_WARNING "Please set ENABLE_DOWNLOAD_MODUEL to ON " " to automation download, or manual download Opencv from" " https://github.com/opencv/opencv , then download model files from" " [opencv source directory]/samples/dnn/face_detector " diff --git a/Src/Plugins/OpenCV/OpenCV_Face.cmake b/Src/Plugins/OpenCV/OpenCV_Face.cmake index bb87db6ee6afb7b6072c25c3cee98c72280e527f..f4c0f5ecb7a753811b9913f53451fc065e208a2f 100644 --- a/Src/Plugins/OpenCV/OpenCV_Face.cmake +++ b/Src/Plugins/OpenCV/OpenCV_Face.cmake @@ -41,18 +41,18 @@ if(EXISTS ${MODEL_FILES}) endif() if(NOT EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv/lbfmodel.yaml") - if(ENABLE_DOWNLOAD) + if(ENABLE_DOWNLOAD_MODUEL) DOWNLOAD(FILENAME "lbfmodel.yaml" HASH 96034b93743e1f7f9748797fb8222dd9 URL "https://raw.githubusercontent.com/kurnianggoro/GSOC2017/master/data/" DESTINATION_DIR "${CMAKE_SOURCE_DIR}/model/Opencv" STATUS RETVAL RELATIVE_URL) - else(ENABLE_DOWNLOAD) - message(AUTHOR_WARNING "Please set ENABLE_DOWNLOAD to ON " + else(ENABLE_DOWNLOAD_MODUEL) + message(AUTHOR_WARNING "Please set ENABLE_DOWNLOAD_MODUEL to ON " " to automation download, or manual download Opencv from" " https://raw.githubusercontent.com/kurnianggoro/GSOC2017/master/data/lbfmodel.yaml " " to ${CMAKE_SOURCE_DIR}/model/Opencv") - endif(ENABLE_DOWNLOAD) + endif(ENABLE_DOWNLOAD_MODUEL) endif() if(EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv/lbfmodel.yaml") INSTALL(FILES ${CMAKE_SOURCE_DIR}/model/Opencv/lbfmodel.yaml @@ -61,7 +61,7 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv/lbfmodel.yaml") endif() if(NOT EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv/face_landmark_model.dat") - if(ENABLE_DOWNLOAD) + if(ENABLE_DOWNLOAD_MODUEL) set(__commit_hash "8afa57abc8229d611c4937165d20e2a2d9fc5a12") set(__file_hash "7505c44ca4eb54b4ab1e4777cb96ac05") DOWNLOAD( @@ -71,12 +71,12 @@ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv/face_landmark_model.dat") DESTINATION_DIR "${CMAKE_SOURCE_DIR}/model/Opencv" STATUS RETVAL RELATIVE_URL ) - else(ENABLE_DOWNLOAD) - message(AUTHOR_WARNING "Please set ENABLE_DOWNLOAD to ON " + else(ENABLE_DOWNLOAD_MODUEL) + message(AUTHOR_WARNING "Please set ENABLE_DOWNLOAD_MODUEL to ON " " to automation download, or manual download Opencv from" " https://raw.githubusercontent.com/kurnianggoro/GSOC2017/master/data/lbfmodel.yaml " " to ${CMAKE_SOURCE_DIR}/model/Opencv") - endif(ENABLE_DOWNLOAD) + endif(ENABLE_DOWNLOAD_MODUEL) endif() if(EXISTS "${CMAKE_SOURCE_DIR}/model/Opencv/lbfmodel.yaml") INSTALL(FILES ${CMAKE_SOURCE_DIR}/model/Opencv/lbfmodel.yaml