Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change cmake submodule macros #17

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Change cmake submodule macros #17

Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c0edd55
Build submoduleList for initialization.
spahrenk Jun 13, 2024
f30b077
Comment.
spahrenk Jun 13, 2024
44b660c
Typo.
spahrenk Jun 13, 2024
be7f157
Modify macros to specify single modules, no options.
spahrenk Jun 14, 2024
6c5b123
Define add_submodules with variadic args.
spahrenk Jun 14, 2024
56d6198
Allow different submodule folder name.
spahrenk Jul 1, 2024
4eeb7ed
Remove unused code.
spahrenk Jul 1, 2024
ae45aae
Improve initialize macro.
spahrenk Jul 2, 2024
8c6a9a7
Match CmakeLists.txt data with .gitmodules listing.
spahrenk Jul 2, 2024
5835705
Improve messages.
spahrenk Jul 2, 2024
10e5889
Remove unused variables.
spahrenk Jul 2, 2024
1b10e0f
Revert submodule labels.
spahrenk Jul 2, 2024
1f969c1
Problem with gtest.
spahrenk Jul 6, 2024
6c71651
Correct repo path.
spahrenk Jul 6, 2024
072351c
Update submodules iff no path given.
spahrenk Jul 8, 2024
30f86f2
Use cmake_parse_arguments.
nealkruis Oct 22, 2024
84c5bd2
Add ability to add/remove submodule variables from the cache.
nealkruis Oct 22, 2024
6d6b463
Fix loops. Clone from submodule path.
nealkruis Oct 22, 2024
cbca027
Remove debug messages.
nealkruis Oct 22, 2024
e2cb7cc
Merge remote-tracking branch 'origin/main' into improve-submodule-init
nealkruis Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 52 additions & 16 deletions cmake/initialize-submodules.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,63 @@
macro(initialize_submodules)
#make a list of all submodules in .gitmodules
macro(make_submodules_list)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
set(git_modules_file "${PROJECT_SOURCE_DIR}/.gitmodules")
if (EXISTS ${git_modules_file})
file(STRINGS ${git_modules_file} file_lines)
set(submoduleNames)
foreach(line ${file_lines})
if (${line} MATCHES "url =")
string(REGEX REPLACE "\\s*url = .*/(.*).git" "\\1" submodule "${line}")
string(STRIP "${submodule}" submodule)
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${submodule}")
message(FATAL_ERROR "Submodule directory \"${CMAKE_CURRENT_SOURCE_DIR}/${submodule}\" does not exist")
endif()
# Initialize submodule if it hasn't already been cloned
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${submodule}/.git")
message(STATUS "Initialize ${submodule} submodule")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive "${CMAKE_CURRENT_SOURCE_DIR}/${submodule}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(FATAL_ERROR "git submodule update --init --recursive ${CMAKE_CURRENT_SOURCE_DIR}/${submodule} failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif()
string(REGEX REPLACE "\\s*url = .*/(.*).git" "\\1" name "${line}")
string(STRIP "${name}" name)
if (DEFINED submoduleNames)
set(submoduleNames ${submoduleNames} ${name})
else()
set(submoduleNames ${name})
endif()
endif()
endforeach()
endif()
endif()
endmacro()
endmacro()

#update the named submodule
macro(update_submodule arg)
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${arg}")
message(FATAL_ERROR "Submodule directory \"${CMAKE_CURRENT_SOURCE_DIR}/${arg}\" does not exist")
endif()

# Initialize submodule if it hasn't already been cloned
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${arg}/.git")
message(STATUS "Initialize ${arg} submodule")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive "${CMAKE_CURRENT_SOURCE_DIR}/${arg}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(FATAL_ERROR "git submodule update --init --recursive ${CMAKE_CURRENT_SOURCE_DIR}/${arg} failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif()
endif()
endmacro()

#update all submodules listed in .gitmodules
macro(initialize_submodules)
make_submodules_list()
if (DEFINED submoduleNames)
foreach (submoduleName ${submoduleNames})
update_submodule(${submoduleName})
endforeach()
unset(submoduleNames)
endif()
endmacro()

#update the named submodule iff it is listed in .gitmodules
macro(initialize_submodule arg)
make_submodules_list()
if (DEFINED submoduleNames)
foreach (submoduleName ${submoduleNames})
if("${submoduleName}" MATCHES "${arg}")
update_submodule(${submoduleName})
endif()
endforeach()
unset(submoduleNames)
endif()
endmacro()
Loading