]> git.ipfire.org Git - thirdparty/git.git/commitdiff
cmake: use the correct file name for the Perl header
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 17 Dec 2024 17:31:59 +0000 (17:31 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2024 20:48:54 +0000 (12:48 -0800)
In e4b488049a5 (Makefile: extract script to massage Perl scripts,
2024-12-06), the code was refactored that is used to transform the Perl
scripts/modules to their final form.

Even the CMake-based build was adjusted, but the change used the file
name `PERL-HEADER` instead of the file name used by the Makefile-based
build (same name but with the `GIT-` prefix). Let's adjust the former to
the latter.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/buildsystems/CMakeLists.txt

index 3dd6b3a130e58e1d0951bb795b5aedbd7783df89..6f35cd66f39c857624eecc9546fb8c6c63e824d7 100644 (file)
@@ -867,7 +867,7 @@ list(TRANSFORM perl_modules REPLACE "${CMAKE_SOURCE_DIR}/" "")
 file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header )
 string(REPLACE "@PATHSEP@" ":" perl_header "${perl_header}")
 string(REPLACE "@INSTLIBDIR@" "${INSTLIBDIR}" perl_header "${perl_header}")
-file(WRITE ${CMAKE_BINARY_DIR}/PERL-HEADER ${perl_header})
+file(WRITE ${CMAKE_BINARY_DIR}/GIT-PERL-HEADER ${perl_header})
 
 add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/GIT-VERSION-FILE"
        COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN"
@@ -888,7 +888,7 @@ foreach(script ${git_perl_scripts} ${perl_modules})
                COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-perl.sh"
                        "${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
                        "${CMAKE_BINARY_DIR}/GIT-VERSION-FILE"
-                       "${CMAKE_BINARY_DIR}/PERL-HEADER"
+                       "${CMAKE_BINARY_DIR}/GIT-PERL-HEADER"
                        "${CMAKE_SOURCE_DIR}/${script}"
                        "${CMAKE_BINARY_DIR}/${perl_gen_path}"
                DEPENDS "${CMAKE_SOURCE_DIR}/generate-perl.sh"