From a28ebcdb8b697f4967bb65c219453e9ae56393af Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 29 Mar 2011 14:51:55 +0000 Subject: [PATCH] Cosmetics git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9883 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 1 - buildtools/Cmake/Modules/FindPCRE.cmake | 5 ++++- buildtools/Cmake/Modules/FindValgrind.cmake | 4 +++- buildtools/Cmake/Option.cmake | 5 +---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 249497205c..6ae37c9e03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ endif(VBC) ### Find programs and paths FIND_PROGRAM(GCOV_PATH gcov) -FIND_PROGRAM(VALGRIND_PATH valgrind) include(FindPerl) if(NOT PERL_EXECUTABLE) message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.") diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake index eba8fb93cc..45eddfe299 100644 --- a/buildtools/Cmake/Modules/FindPCRE.cmake +++ b/buildtools/Cmake/Modules/FindPCRE.cmake @@ -52,4 +52,7 @@ if(PATH_PCRE_LIB) message(STATUS "Looking for lib pcre - found") else(PATH_PCRE_LIB) message(STATUS "Looking for lib pcre - not found") -endif(PATH_PCRE_LIB) \ No newline at end of file +endif(PATH_PCRE_LIB) + +mark_as_advanced(PATH_PCRE_H) +mark_as_advanced(PATH_PCRE_LIB) \ No newline at end of file diff --git a/buildtools/Cmake/Modules/FindValgrind.cmake b/buildtools/Cmake/Modules/FindValgrind.cmake index 22f1fe835b..33f022b976 100644 --- a/buildtools/Cmake/Modules/FindValgrind.cmake +++ b/buildtools/Cmake/Modules/FindValgrind.cmake @@ -30,4 +30,6 @@ if(VALGRIND_EXE) else(VALGRIND_EXE) set(enable_memcheck false) message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.") -endif(VALGRIND_EXE) \ No newline at end of file +endif(VALGRIND_EXE) + +mark_as_advanced(VALGRIND_EXE) \ No newline at end of file diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index c942375f58..1d521182d3 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -43,7 +43,7 @@ if(enable_supernovae AND enable_model-checking) message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n") endif(enable_supernovae AND enable_model-checking) -mark_as_advanced(PATH_PCRE_LIB) + mark_as_advanced(HAVE_SSH) mark_as_advanced(HAVE_RSYNC) #mark_as_advanced(enable_coverage) @@ -66,11 +66,8 @@ mark_as_advanced(ICONV_PATH) mark_as_advanced(MAKE_PATH) mark_as_advanced(SVN) mark_as_advanced(GIT) -mark_as_advanced(VALGRIND_PATH) -mark_as_advanced(PATH_PCRE_H) mark_as_advanced(CMAKE_OSX_ARCHITECTURES) mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET) mark_as_advanced(CMAKE_OSX_SYSROOT) mark_as_advanced(SED_EXE) mark_as_advanced(BIBTEX2HTML) -mark_as_advanced(enable_pcre) \ No newline at end of file -- 2.20.1