Merge pull request #60 from antoniovazquezblanco/dev/cmake_modules

Use submodules for cmake modules
BatchDrake · Jun 7, 2023 · 9181e56 · 9181e56
2 parents bd4295d + 9d2e887
commit 9181e56
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 188 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,3 +7,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -16,6 +16,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
       with:
+        submodules: true
         fetch-depth: 0
 
     - name: Build
@@ -49,6 +50,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
       with:
+        submodules: true
         fetch-depth: 0
 
     - name: Build
@@ -70,6 +72,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
       with:
+        submodules: true
         fetch-depth: 0
 
     - name: Build

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -23,6 +23,9 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
+      with:
+        submodules: true
+        fetch-depth: 0
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "cmake/cmake-gitversiondetect"]
+	path = cmake/cmake-gitversiondetect
+	url = https://github.com/antoniovazquezblanco/cmake-gitversiondetect.git
+[submodule "cmake/cmake-pcfilegenerator"]
+	path = cmake/cmake-pcfilegenerator
+	url = https://github.com/antoniovazquezblanco/cmake-pcfilegenerator.git
+[submodule "cmake/cmake-relativefilemacro"]
+	path = cmake/cmake-relativefilemacro
+	url = https://github.com/antoniovazquezblanco/cmake-relativefilemacro.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,8 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 # CMake modules search path
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+file(GLOB MODULE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/*/" LIST_DIRECTORIES true)
+list(APPEND CMAKE_MODULE_PATH "${MODULE_DIRS}")
 
 # Use git version detect to obtain a project version based on tags
 include(GitVersionDetect)

diff --git a/cmake/cmake-gitversiondetect b/cmake/cmake-gitversiondetect
diff --git a/cmake/cmake-pcfilegenerator b/cmake/cmake-pcfilegenerator
diff --git a/cmake/cmake-relativefilemacro b/cmake/cmake-relativefilemacro
diff --git a/cmake/modules/GitVersionDetect.cmake b/cmake/modules/GitVersionDetect.cmake
diff --git a/cmake/modules/PcFileGenerator.cmake b/cmake/modules/PcFileGenerator.cmake
diff --git a/cmake/modules/RelativeFileMacro.cmake b/cmake/modules/RelativeFileMacro.cmake