diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2008-01-25 18:07:59 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2008-01-25 18:07:59 (GMT) |
| commit | bd28610ec347b5d302f708ad5b66409fe350340b (patch) | |
| tree | 1afd7f5f4ef888326c2cffd1fc40a34795dae36f /Modules/FindPerl.cmake | |
| parent | 386a6ebf251f45123ca542bef8f4050fd5f37522 (diff) | |
| download | CMake-bd28610ec347b5d302f708ad5b66409fe350340b.zip CMake-bd28610ec347b5d302f708ad5b66409fe350340b.tar.gz CMake-bd28610ec347b5d302f708ad5b66409fe350340b.tar.bz2 | |
ENH: update for Tcl/Tk 8.5
Diffstat (limited to 'Modules/FindPerl.cmake')
| -rw-r--r-- | Modules/FindPerl.cmake | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake index 0ce3408..b3c5e4f 100644 --- a/Modules/FindPerl.cmake +++ b/Modules/FindPerl.cmake @@ -6,25 +6,32 @@ INCLUDE(FindCygwin) -GET_FILENAME_COMPONENT( - ActivePerl_CurrentVersion - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl;CurrentVersion]" - NAME) - -FIND_PROGRAM(PERL_EXECUTABLE - perl - "C:/Perl/bin" - [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\${ActivePerl_CurrentVersion}]/bin +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(WIN32) + +FIND_PROGRAM(PERL_EXECUTABLE + NAMES perl + PATHS ${PERL_POSSIBLE_BIN_PATHS} + ) # Deprecated settings for compatibility with CMake1.4 -SET (PERL ${PERL_EXECUTABLE}) +SET(PERL ${PERL_EXECUTABLE}) # handle the QUIETLY and REQUIRED arguments and set PERL_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl DEFAULT_MSG PERL_EXECUTABLE) -MARK_AS_ADVANCED( PERL_EXECUTABLE ) +MARK_AS_ADVANCED(PERL_EXECUTABLE) |