From f64950d3ea89cec99328745366c306f2eb1276c3 Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Mon, 3 Sep 2018 12:09:49 +0200 Subject: [PATCH] Enhance cmake macros --- cmake/FindGuile.cmake | 8 ++------ cmake/FindOctave.cmake | 6 +----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cmake/FindGuile.cmake b/cmake/FindGuile.cmake index 48cdf44..8b511b4 100644 --- a/cmake/FindGuile.cmake +++ b/cmake/FindGuile.cmake @@ -91,11 +91,7 @@ endif () # handle REQUIRED and QUIET options include (FindPackageHandleStandardArgs) -if (CMAKE_VERSION LESS 2.8.3) - find_package_handle_standard_args (Guile DEFAULT_MSG GUILE_ROOT_DIR GUILE_INCLUDE_DIRS GUILE_LIBRARIES GUILE_VERSION_STRING) -else () - find_package_handle_standard_args (Guile REQUIRED_VARS GUILE_ROOT_DIR GUILE_INCLUDE_DIRS GUILE_LIBRARIES VERSION_VAR GUILE_VERSION_STRING) -endif () +find_package_handle_standard_args (Guile REQUIRED_VARS GUILE_EXECUTABLE GUILE_ROOT_DIR GUILE_INCLUDE_DIRS GUILE_LIBRARIES VERSION_VAR GUILE_VERSION_STRING) -MARK_AS_ADVANCED(GUILE_INCLUDE_DIR GUILE_LIBRARY) +mark_as_advanced (GUILE_INCLUDE_DIR GUILE_LIBRARY) diff --git a/cmake/FindOctave.cmake b/cmake/FindOctave.cmake index b31d305..a44ebff 100644 --- a/cmake/FindOctave.cmake +++ b/cmake/FindOctave.cmake @@ -183,11 +183,7 @@ endmacro () # handle REQUIRED and QUIET options include (FindPackageHandleStandardArgs) -if (CMAKE_VERSION LESS 2.8.3) - find_package_handle_standard_args (Octave DEFAULT_MSG OCTAVE_EXECUTABLE OCTAVE_ROOT_DIR OCTAVE_INCLUDE_DIRS OCTAVE_LIBRARIES OCTAVE_VERSION_STRING) -else () - find_package_handle_standard_args (Octave REQUIRED_VARS OCTAVE_EXECUTABLE OCTAVE_ROOT_DIR OCTAVE_INCLUDE_DIRS OCTAVE_LIBRARIES VERSION_VAR OCTAVE_VERSION_STRING) -endif () +find_package_handle_standard_args (Octave REQUIRED_VARS OCTAVE_EXECUTABLE OCTAVE_ROOT_DIR OCTAVE_INCLUDE_DIRS OCTAVE_LIBRARIES VERSION_VAR OCTAVE_VERSION_STRING) mark_as_advanced ( -- 2.30.2