From ab4337b69bd5b574b3152ca7ada7251ca21a4e59 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 12 Nov 2010 15:22:04 +0000 Subject: [PATCH 1/1] Always check for perl since we need it quite a lot, actually git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8532 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 1 + buildtools/Cmake/AddTests.cmake | 1 - buildtools/Cmake/MaintainerMode.cmake | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 292f43d9f0..da7ee4c53b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(libsmpi_version "${release_version}") ### Find programs and paths FIND_PROGRAM(GCOV_PATH gcov) FIND_PROGRAM(VALGRIND_PATH valgrind) +include(FindPerl) ### SET THE PROJECT_DIRECTORY SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}") diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 75be153a9f..058e632242 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -6,7 +6,6 @@ if(enable_smpi) endif(enable_smpi) if(enable_memcheck) - include(FindPerl) exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION") if(VALGRIND_VERSION AND PERL_EXECUTABLE) string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}") diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake index cc171e48c1..477d66c9d7 100644 --- a/buildtools/Cmake/MaintainerMode.cmake +++ b/buildtools/Cmake/MaintainerMode.cmake @@ -2,7 +2,6 @@ if(enable_maintainer_mode AND NOT WIN32) find_program(FLEX_EXE NAMES flex) find_program(FLEXML_EXE NAMES flexml) find_program(SED_EXE NAMES sed) -include(FindPerl) IF(FLEX_EXE) set(HAVE_FLEX 1) -- 2.20.1