diff options
| author | Ike Gilbert <ike@imgilbert.com> | 2017-07-28 17:23:48 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-07-29 19:52:20 +0000 |
| commit | 76762d69b55065af69df075ca8bd3425b5b3ca84 (patch) | |
| tree | 62d6cad75ab8a6ba9e6bc2abc0ee34d56383fb87 /cmake/modules | |
| parent | f461a3a743750421ec377357687f65c2c007a63a (diff) | |
Windows: fix generation with CMake 3.9.0
By using CMake FindPerl.cmake module, CYGWIN_INSTALL_PATH variable
gets overwritten, bypassing our modified FindCygwin.cmake.
Let's package our own version FindPerl.cmake to avoid this.
Bug: 13922
Change-Id: If68e96ba312c2c6fa417721e7aec2ae6e5179a81
Reviewed-on: https://code.wireshark.org/review/22834
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindPerl.cmake | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/cmake/modules/FindPerl.cmake b/cmake/modules/FindPerl.cmake new file mode 100644 index 0000000000..479b7197b5 --- /dev/null +++ b/cmake/modules/FindPerl.cmake @@ -0,0 +1,81 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. +# This code was copied from +# http://cmake.org/gitweb?p=cmake.git;a=blob_plain;f=Modules/FindPerl.cmake;hb=HEAD +# and modified so as to be compatible with our packaged FindCygwin.cmake + +#.rst: +# FindPerl +# -------- +# +# Find perl +# +# this module looks for Perl +# +# :: +# +# PERL_EXECUTABLE - the full path to perl +# PERL_FOUND - If false, don't attempt to use perl. +# PERL_VERSION_STRING - version of perl found (since CMake 2.8.8) + +include(${CMAKE_CURRENT_LIST_DIR}/FindCygwin.cmake) + +set(PERL_POSSIBLE_BIN_PATHS + ${CYGWIN_INSTALL_PATH}/bin + ) + +if(WIN32) + get_filename_component( + ActivePerl_CurrentVersion + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl;CurrentVersion]" + NAME) + set(PERL_POSSIBLE_BIN_PATHS ${PERL_POSSIBLE_BIN_PATHS} + "C:/Perl/bin" + [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\${ActivePerl_CurrentVersion}]/bin + ) +endif() + +find_program(PERL_EXECUTABLE + NAMES perl + PATHS ${PERL_POSSIBLE_BIN_PATHS} + ) + +if(PERL_EXECUTABLE) + ### PERL_VERSION + execute_process( + COMMAND + ${PERL_EXECUTABLE} -V:version + OUTPUT_VARIABLE + PERL_VERSION_OUTPUT_VARIABLE + RESULT_VARIABLE + PERL_VERSION_RESULT_VARIABLE + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NOT PERL_VERSION_RESULT_VARIABLE AND NOT PERL_VERSION_OUTPUT_VARIABLE MATCHES "^version='UNKNOWN'") + string(REGEX REPLACE "version='([^']+)'.*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE}) + else() + execute_process( + COMMAND ${PERL_EXECUTABLE} -v + OUTPUT_VARIABLE PERL_VERSION_OUTPUT_VARIABLE + RESULT_VARIABLE PERL_VERSION_RESULT_VARIABLE + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NOT PERL_VERSION_RESULT_VARIABLE AND PERL_VERSION_OUTPUT_VARIABLE MATCHES "This is perl.*[ \\(]v([0-9\\._]+)[ \\)]") + set(PERL_VERSION_STRING "${CMAKE_MATCH_1}") + elseif(NOT PERL_VERSION_RESULT_VARIABLE AND PERL_VERSION_OUTPUT_VARIABLE MATCHES "This is perl, version ([0-9\\._]+) +") + set(PERL_VERSION_STRING "${CMAKE_MATCH_1}") + endif() + endif() +endif() + +# Deprecated settings for compatibility with CMake1.4 +set(PERL ${PERL_EXECUTABLE}) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl + REQUIRED_VARS PERL_EXECUTABLE + VERSION_VAR PERL_VERSION_STRING) + +mark_as_advanced(PERL_EXECUTABLE) |