CMake: Find the Perl executable, and use it to run perl scripts

This is somewhat more portable than just hardcoding perl or in the
triehash case /usr/bin/perl in the shebang.

Thanks: Guillem Jover for the hint
Gbp-Dch: ignore

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f40e389ae00712901748fb4f1f2ca61436988a40..99ee6b72b34eb5bdc7acadf8cb25045e48a852ad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,8 @@ find_package(Threads)
 find_package(LFS REQUIRED)
 find_package(Iconv REQUIRED)
 
+find_package(Perl REQUIRED)
+
 if(USE_NLS)
   find_package(Intl REQUIRED)
   link_libraries(${Intl_LIBRARIES})
@@ -173,7 +175,7 @@ set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
 set(PACKAGE_VERSION "1.4~beta3")
 
 if (NOT DEFINED DPKG_DATADIR)
-  execute_process(COMMAND perl -MDpkg -e "print $Dpkg::DATADIR;"
+  execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
                   OUTPUT_VARIABLE DPKG_DATADIR_CMD OUTPUT_STRIP_TRAILING_WHITESPACE)
   message(STATUS "Found dpkg data dir: ${DPKG_DATADIR_CMD}")
   set(DPKG_DATADIR "${DPKG_DATADIR_CMD}" CACHE PATH "dpkg data directory")

diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt
index 25ed13ec34b8dabed7ec1d4f695417f2baadb022..c43e900280e15bd3e7cfe9cf4c469a758ab297ad 100644 (file)
--- a/apt-pkg/CMakeLists.txt
+++ b/apt-pkg/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(${PROJECT_BINARY_DIR}/include/apt-pkg)
 add_definitions("-DAPT_PKG_EXPOSE_STRING_VIEW")
 
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/apt-pkg/)
-execute_process(COMMAND ${PROJECT_SOURCE_DIR}/triehash/triehash.pl
+execute_process(COMMAND ${PERL_EXECUTABLE} ${PROJECT_SOURCE_DIR}/triehash/triehash.pl
                         --ignore-case
                          --header ${PROJECT_BINARY_DIR}/include/apt-pkg/tagfile-keys.h
                          --code ${CMAKE_CURRENT_BINARY_DIR}/tagfile-keys.cc