nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Prepare gitcommit.cmake to support multiple output types.

Browse Source 
I'm about to want to embed the current git commit into a Halibut
source file, for which I'll need to add a second output mode to the
existing script that finds it out.
This commit is contained in:
Simon Tatham 2021-05-03 15:08:41 +01:00
parent de7c826fa3
commit 4a8fc43d81
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/gitcommit.cmake
View File

@ -37,7 +37,8 @@ else()
endif() endif()
endif() endif()
file(WRITE "${OUTPUT_FILE}" "\ if(OUTPUT_TYPE STREQUAL header)
file(WRITE "${OUTPUT_FILE}" "\
/* /*
* cmake_commit.h - string literal giving the source git commit, if known. * cmake_commit.h - string literal giving the source git commit, if known.
* *
@ -46,3 +47,6 @@ file(WRITE "${OUTPUT_FILE}" "\
const char commitid[] = \"${commit}\"; const char commitid[] = \"${commit}\";
") ")
else()
message(FATAL_ERROR "Set OUTPUT_TYPE when running this script")
endif()

1
cmake/setup.cmake
View File

@ -44,6 +44,7 @@ add_custom_target(check_git_commit
-DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
-DTOPLEVEL_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DTOPLEVEL_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DOUTPUT_FILE=${INTERMEDIATE_COMMIT_C} -DOUTPUT_FILE=${INTERMEDIATE_COMMIT_C}
-DOUTPUT_TYPE=header
-P ${CMAKE_SOURCE_DIR}/cmake/gitcommit.cmake -P ${CMAKE_SOURCE_DIR}/cmake/gitcommit.cmake
DEPENDS ${CMAKE_SOURCE_DIR}/cmake/gitcommit.cmake DEPENDS ${CMAKE_SOURCE_DIR}/cmake/gitcommit.cmake
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}