strip

[nlopt.git] / cmake / FindGuile.cmake

diff --git a/cmake/FindGuile.cmake b/cmake/FindGuile.cmake
index c2862d0cc17f0184c660c1e2fc7f96a451f29d67..8b511b4d28d658173a73bab3025db69c71c2f021 100644 (file)
--- a/cmake/FindGuile.cmake
+++ b/cmake/FindGuile.cmake
@@ -62,6 +62,10 @@ if (GUILE_INCLUDE_DIR)
 
 endif ()
 
+find_program(GUILE_EXECUTABLE
+              NAMES guile
+           )
+
 find_program(GUILE_CONFIG_EXECUTABLE
               NAMES guile-config
            )
@@ -71,7 +75,7 @@ if (GUILE_CONFIG_EXECUTABLE)
   execute_process (COMMAND ${GUILE_CONFIG_EXECUTABLE} info prefix
                     OUTPUT_VARIABLE GUILE_ROOT_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
-                    
+
   execute_process (COMMAND ${GUILE_CONFIG_EXECUTABLE} info sitedir
                     OUTPUT_VARIABLE GUILE_SITE_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -87,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)