diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-01-17 01:40:53 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-01-17 01:43:50 +0100 |
| commit | 1dcd7d291be1d39127c4b95778549f323e61ef15 (patch) | |
| tree | 41bf9099867ffcfd5900250862ab008b9da959e3 | |
| parent | 6ede8952f55a1bc356b42b1adc7b9bd504af943c (diff) | |
| download | apt-1dcd7d291be1d39127c4b95778549f323e61ef15.tar.gz | |
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
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | apt-pkg/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f40e389ae..99ee6b72b 100644 --- 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 25ed13ec3..c43e90028 100644 --- 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 |