Fix ruby when it's required

svn path=/trunk/KDE/kdelibs/; revision=650719

1 files changed, 49 insertions, 34 deletions

diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake
index 06843a72..aa31d053 100644
--- a/modules/FindRUBY.cmake
+++ b/modules/FindRUBY.cmake
@@ -6,8 +6,9 @@
 #  RUBY_LIBRARY      = full path+file to the ruby library
 #  RUBY_INCLUDE_PATH = path to where ruby.h can be found
 #  RUBY_EXECUTABLE   = full path+file to the ruby binary
+#  RUBY_FOUND        = Ruby was found under system.
 #
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -15,7 +16,7 @@
 
 if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
    # Already in cache, be silent
-   set(RUBY_FIND_QUIETLY TRUE)
+   SET(RUBY_FOUND TRUE)
 endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)		
 
 #   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
@@ -26,44 +27,58 @@ endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
 
 FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19)
 
-EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir'] || Config::CONFIG['rubyincludedir']"
-   OUTPUT_VARIABLE RUBY_ARCH_DIR)
+IF(RUBY_EXECUTABLE)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir'] || Config::CONFIG['rubyincludedir']"
+   		OUTPUT_VARIABLE RUBY_ARCH_DIR)
 
-EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
-   OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
+   		OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH)
 
-EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
-   OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
+   		OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH)
 
-EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['ruby_version']"
-   OUTPUT_VARIABLE RUBY_VERSION)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['ruby_version']"
+   		OUTPUT_VARIABLE RUBY_VERSION)
 
-EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['sitelibdir']"
-   OUTPUT_VARIABLE RUBY_SITE_LIB_DIR)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['sitelibdir']"
+		OUTPUT_VARIABLE RUBY_SITE_LIB_DIR)
 
-EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['sitearchdir']"
-   OUTPUT_VARIABLE RUBY_SITE_ARCH_DIR)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['sitearchdir']"
+		OUTPUT_VARIABLE RUBY_SITE_ARCH_DIR)
 
-# remove the new lines from the output by replacing them with empty strings
-STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
-STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
-STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
-STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}")
-STRING(REPLACE "\n" "" RUBY_SITE_LIB_DIR "${RUBY_SITE_LIB_DIR}")
-STRING(REPLACE "\n" "" RUBY_SITE_ARCH_DIR "${RUBY_SITE_ARCH_DIR}")
+	# remove the new lines from the output by replacing them with empty strings
+	STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
+	STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
+	STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
+	STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}")
+	STRING(REPLACE "\n" "" RUBY_SITE_LIB_DIR "${RUBY_SITE_LIB_DIR}")
+	STRING(REPLACE "\n" "" RUBY_SITE_ARCH_DIR "${RUBY_SITE_ARCH_DIR}")
 
-FIND_PATH(RUBY_INCLUDE_PATH 
-  NAMES ruby.h
-  PATHS ${RUBY_ARCH_DIR}
-  )
+	FIND_PATH(RUBY_INCLUDE_PATH 
+  		NAMES ruby.h
+  		PATHS ${RUBY_ARCH_DIR}
+  	)
+
+	FIND_LIBRARY(RUBY_LIBRARY
+		NAMES ruby${RUBY_VERSION} ruby
+		PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+  	)
+	SET(AKODE_FOUND TRUE)
+	MARK_AS_ADVANCED(
+	  RUBY_EXECUTABLE
+	  RUBY_LIBRARY
+	  RUBY_INCLUDE_PATH
+	  )
+ENDIF(RUBY_EXECUTABLE)
+
+IF(RUBY_FOUND)
+  IF(NOT RUBY_FIND_QUIETLY)
+    MESSAGE(STATUS "Ruby found: ${RUBY_LIBRARY}")
+  ENDIF(NOT RUBY_FIND_QUIETLY)
+ELSE(RUBY_FOUND)
+  IF(RUBY_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Ruby")
+  ENDIF(RUBY_FIND_REQUIRED)
+ENDIF(RUBY_FOUND)
 
-FIND_LIBRARY(RUBY_LIBRARY
-  NAMES ruby${RUBY_VERSION} ruby
-  PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-  )
 
-MARK_AS_ADVANCED(
-  RUBY_EXECUTABLE
-  RUBY_LIBRARY
-  RUBY_INCLUDE_PATH
-  )