Enhance cmake macros

diff --git a/cmake/FindGuile.cmake b/cmake/FindGuile.cmake
index 48cdf44c201e068b91061036a7abc0e30b76d56f..8b511b4d28d658173a73bab3025db69c71c2f021 100644 (file)
--- 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 b31d30576fe31fa0351ceaa6e3b4834f23b1c523..a44ebfff4ba96dffa89ae2688007cb2807bbec6f 100644 (file)
--- 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 (