From 74f3e2f3d94455748ceb92cdb69f403dd08558d4 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Fri, 17 Sep 2021 16:44:56 +0200
Subject: [PATCH] [#107] Automated git submodules in cmake did not work, return
to shell script idea
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
config/Libraries.cmake | 5 +---
config/ext/Git.cmake | 60 +-----------------------------------------
2 files changed, 2 insertions(+), 63 deletions(-)
diff --git a/config/Libraries.cmake b/config/Libraries.cmake
index 9ad756c0..ca2af95e 100644
--- a/config/Libraries.cmake
+++ b/config/Libraries.cmake
@@ -16,12 +16,9 @@ if(NOT WIN32)
list(APPEND vkcv_flags -fopenmp)
endif()
-# add custom functions to use git automatically
+# add custom functions to check for git submodules
include(${vkcv_config_ext}/Git.cmake)
-init_git_lfs()
-init_git_submodules()
-
list(APPEND vkcv_definitions _USE_MATH_DEFINES)
# some formatted printing
diff --git a/config/ext/Git.cmake b/config/ext/Git.cmake
index 6d8fb39a..a943ce02 100644
--- a/config/ext/Git.cmake
+++ b/config/ext/Git.cmake
@@ -1,73 +1,15 @@
-function(init_git_lfs)
- find_program(git_program "git")
-
- if (EXISTS ${git_program})
- add_custom_target(
- init_git_lfs
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- )
-
- add_custom_command(
- TARGET init_git_lfs
- PRE_BUILD
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- COMMAND git lfs install
- COMMENT "Initializing Git LFS"
- )
- endif()
-endfunction()
-
-function(init_git_submodules)
- find_program(git_program "git")
-
- if (EXISTS ${git_program})
- add_custom_target(
- init_git_submodules
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- )
-
- add_custom_command(
- TARGET init_git_submodules
- PRE_BUILD
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- COMMAND git submodule init
- COMMENT "Initializing Git Submodules"
- )
- endif()
-endfunction()
-
function(use_git_submodule submodule_path submodule_status)
file(GLOB path_glob "${submodule_path}/*")
list(LENGTH path_glob glob_len)
+
if(glob_len GREATER 0)
set(${submodule_status} TRUE PARENT_SCOPE)
return()
endif()
- get_filename_component(submodule_directory ${submodule_path} DIRECTORY)
get_filename_component(submodule_name ${submodule_path} NAME)
- find_program(git_program "git")
-
- if (EXISTS ${git_program})
- add_custom_command(
- OUTPUT "${submodule_path}"
- PRE_BUILD
- WORKING_DIRECTORY "${submodule_directory}"
- COMMAND git submodule update
- COMMENT "Updating Git Submodules"
- )
-
- file(GLOB path_glob "${submodule_path}/*")
- list(LENGTH path_glob glob_len)
- if(glob_len GREATER 0)
- set(${submodule_status} TRUE PARENT_SCOPE)
- return()
- endif()
- endif()
-
message(WARNING "${submodule_name} is required..! Update the submodules!")
-
set(${submodule_status} FALSE PARENT_SCOPE)
endfunction()
--
GitLab