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

1677: dont rerun cmake for git ref #1683

Merged
merged 11 commits into from
Mar 1, 2022
+131 −238
Merged

1677: dont rerun cmake for git ref #1683

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2cf7f5e
#1677: cmake: Move git configuration detection into a standalone cmak…
nmm0 Feb 22, 2022
d93609a
#1677: cmake: run generator for git configurator as a custom command …
nmm0 Feb 22, 2022
f526544
#1677: cmake: watch for changes in git refspec files
nmm0 Feb 22, 2022
1beaa36
#1677: cmake: set a secondary variable for refspec files so it can be…
nmm0 Feb 22, 2022
46db048
#1677: cmake: clean up old git revision scripts
nmm0 Feb 22, 2022
77df30d
#1677: cmake: only depend on packed refs file if it exists
nmm0 Feb 22, 2022
8aee264
#1677: cmake: don't silence git command errors
nmm0 Feb 22, 2022
c4d037b
#1677: cmake: use the parent directory of the .git folder to locate t…
nmm0 Feb 22, 2022
34e8af5
#1677: cmake: set dependency on entire .git folder
nmm0 Feb 22, 2022
773db10
#1677: cmake: get git folder using git rev-parse and similarly for th…
nmm0 Feb 23, 2022
6803ce6
#1677: cmake: fix newline EOF
nmm0 Feb 24, 2022
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
Prev Previous commit
Next Next commit
#1677: cmake: watch for changes in git refspec files
@nmm0
nmm0 committed Feb 28, 2022
commit f526544f7f6dea24004bd2a362eb7418819ad5d4
9 changes: 8 additions & 1 deletion cmake/build_git_info.cmake
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,13 @@ if(NOT EXISTS "${GIT_DIR}/HEAD")
endif()
set(HEAD_FILE "${GIT_DIR}/HEAD")

file(READ "${HEAD_FILE}" HEAD_CONTENTS LIMIT 1024)
string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
if(HEAD_CONTENTS MATCHES "ref")
# named branch
string(REPLACE "ref: " "" REFSPEC "${HEAD_CONTENTS}")
endif()

message(STATUS "Git HEAD file: \"${HEAD_FILE}\"")

find_package(Git REQUIRED)
@@ -39,7 +46,7 @@ set(VT_GIT_CONFIG_FILE "${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revis
add_custom_command(
OUTPUT ${VT_GIT_CONFIG_FILE}
COMMAND ${CMAKE_COMMAND} -DIN_FILE=${PROJECT_BASE_DIR}/vt_git_revision.cc.in -DOUT_FILE=${VT_GIT_CONFIG_FILE} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DGIT_DIR=${GIT_DIR} -DHEAD_FILE=${HEAD_FILE} -P ${CMAKE_CURRENT_LIST_DIR}/run-git.cmake
DEPENDS ${HEAD_FILE}
DEPENDS ${HEAD_FILE} ${GIT_DIR}/packed-refs ${GIT_DIR}/${REFSPEC}
)

target_sources(${VIRTUAL_TRANSPORT_LIBRARY} PRIVATE ${VT_GIT_CONFIG_FILE})