Find attached what i have so far. It is not active or documented yet. Just for
a review of the general logic.
I found a problem (or overanalyze here). How can i find out if the
installation prefix of ruby is the same as the installation prefix of cmake if
autoconf (ruby uses it) provides --exec_prefix, --prefix and --libdir options?
Perhaps just compare rbcofigs prefix and CMAKE_INSTALL_PREFIX and be done? If
someone plays with those options (s)he deserves the problems?
Mike
>From eecd98e62fe65659a85eb4441967a4151a856c39 Mon Sep 17 00:00:00 2001
From: Michael Jansen <[email protected]>
Date: Mon, 7 Mar 2011 22:43:51 +0100
Subject: [PATCH 1/6] Initial Version copied from cmake 2.8.1
---
cmake/FindRuby.cmake | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 257 insertions(+), 0 deletions(-)
create mode 100644 cmake/FindRuby.cmake
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
new file mode 100644
index 0000000..0e36e08
--- /dev/null
+++ b/cmake/FindRuby.cmake
@@ -0,0 +1,257 @@
+# - Find Ruby
+# This module finds if Ruby is installed and determines where the include files
+# and libraries are. Ruby 1.8 and 1.9 are supported. The minimum required version
+# specified in the find_package() command is honored.
+# It also determines what the name of the library is. This
+# code sets the following variables:
+#
+# RUBY_EXECUTABLE = full path to the ruby binary
+# RUBY_INCLUDE_DIRS = include dirs to be used when using the ruby library
+# RUBY_LIBRARY = full path to the ruby library
+# RUBY_VERSION = the version of ruby which was found, e.g. "1.8.7"
+# RUBY_FOUND = set to true if ruby ws found successfully
+#
+# RUBY_INCLUDE_PATH = same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
+
+#=============================================================================
+# Copyright 2004-2009 Kitware, Inc.
+# Copyright 2008-2009 Alexander Neundorf <[email protected]>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
+# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+
+# uncomment the following line to get debug output for this file
+SET(_RUBY_DEBUG_OUTPUT TRUE)
+
+# Determine the list of possible names of the ruby executable depending
+# on which version of ruby is required
+SET(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
+
+# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
+IF(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)
+ SET(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
+ELSE(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)
+ SET(Ruby_FIND_VERSION_SHORT_NODOT "18")
+ENDIF(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)
+
+SET(_RUBY_POSSIBLE_EXECUTABLE_NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES} ruby1.9 ruby19)
+
+# if we want a version below 1.9, also look for ruby 1.8
+IF("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
+ SET(_RUBY_POSSIBLE_EXECUTABLE_NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES} ruby1.8 ruby18)
+ENDIF("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
+
+FIND_PROGRAM(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
+
+
+IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
+ # query the ruby version
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MAJOR']"
+ OUTPUT_VARIABLE RUBY_VERSION_MAJOR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MINOR']"
+ OUTPUT_VARIABLE RUBY_VERSION_MINOR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['TEENY']"
+ OUTPUT_VARIABLE RUBY_VERSION_PATCH)
+
+ # query the different directories
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']"
+ OUTPUT_VARIABLE RUBY_ARCH_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['arch']"
+ OUTPUT_VARIABLE RUBY_ARCH)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubyhdrdir']"
+ OUTPUT_VARIABLE RUBY_HDR_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']"
+ OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
+ OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR)
+
+ # site_ruby
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']"
+ OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']"
+ OUTPUT_VARIABLE RUBY_SITELIB_DIR)
+
+ # vendor_ruby available ?
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
+ OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
+
+ IF(RUBY_HAS_VENDOR_RUBY)
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']"
+ OUTPUT_VARIABLE RUBY_VENDORLIB_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']"
+ OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
+ ENDIF(RUBY_HAS_VENDOR_RUBY)
+
+ # save the results in the cache so we don't have to run ruby the next time again
+ SET(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
+ SET(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
+ SET(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
+ SET(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
+ SET(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9)" FORCE)
+ SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
+ SET(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
+ SET(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
+ SET(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE)
+ SET(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE)
+ SET(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE)
+ SET(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE)
+
+ MARK_AS_ADVANCED(
+ RUBY_ARCH_DIR
+ RUBY_ARCH
+ RUBY_HDR_DIR
+ RUBY_POSSIBLE_LIB_DIR
+ RUBY_RUBY_LIB_DIR
+ RUBY_SITEARCH_DIR
+ RUBY_SITELIB_DIR
+ RUBY_HAS_VENDOR_RUBY
+ RUBY_VENDORARCH_DIR
+ RUBY_VENDORLIB_DIR
+ RUBY_VERSION_MAJOR
+ RUBY_VERSION_MINOR
+ RUBY_VERSION_PATCH
+ )
+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
+
+# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
+# try to detect which version we found. This is not too good.
+IF(NOT RUBY_VERSION_MAJOR)
+ # by default assume 1.8.0
+ SET(RUBY_VERSION_MAJOR 1)
+ SET(RUBY_VERSION_MINOR 8)
+ SET(RUBY_VERSION_PATCH 0)
+ # check whether we found 1.9.x
+ IF(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR)
+ SET(RUBY_VERSION_MAJOR 1)
+ SET(RUBY_VERSION_MINOR 9)
+ ENDIF(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR)
+ENDIF(NOT RUBY_VERSION_MAJOR)
+
+
+SET(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
+SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
+SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
+SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
+
+# Now we know which version we found
+IF(Ruby_FIND_VERSION)
+ IF(${RUBY_VERSION} VERSION_LESS ${Ruby_FIND_VERSION})
+ # force running ruby the next time again
+ SET(RUBY_VERSION_MAJOR "" CACHE PATH "The Ruby major version" FORCE)
+ IF(Ruby_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Ruby version ${Ruby_FIND_VERSION} required, but only version ${RUBY_VERSION} found.")
+ ELSE(Ruby_FIND_REQUIRED)
+ IF(NOT Ruby_FIND_QUIETLY)
+ MESSAGE(STATUS "Ruby version ${Ruby_FIND_VERSION} required, but only version ${RUBY_VERSION} found.")
+ ENDIF(NOT Ruby_FIND_QUIETLY)
+ RETURN()
+ ENDIF(Ruby_FIND_REQUIRED)
+ ENDIF(${RUBY_VERSION} VERSION_LESS ${Ruby_FIND_VERSION})
+ENDIF(Ruby_FIND_VERSION)
+
+FIND_PATH(RUBY_INCLUDE_DIR
+ NAMES ruby.h
+ HINTS
+ ${RUBY_HDR_DIR}
+ ${RUBY_ARCH_DIR}
+ /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
+
+SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
+
+# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
+IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+ FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
+ NAMES ruby/config.h config.h
+ HINTS
+ ${RUBY_HDR_DIR}/${RUBY_ARCH}
+ ${RUBY_ARCH_DIR}
+ )
+
+ SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
+ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+
+
+# Determine the list of possible names for the ruby library
+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
+
+IF(WIN32)
+ SET( _RUBY_MSVC_RUNTIME "" )
+ IF( MSVC60 )
+ SET( _RUBY_MSVC_RUNTIME "60" )
+ ENDIF( MSVC60 )
+ IF( MSVC70 )
+ SET( _RUBY_MSVC_RUNTIME "70" )
+ ENDIF( MSVC70 )
+ IF( MSVC71 )
+ SET( _RUBY_MSVC_RUNTIME "71" )
+ ENDIF( MSVC71 )
+ IF( MSVC80 )
+ SET( _RUBY_MSVC_RUNTIME "80" )
+ ENDIF( MSVC80 )
+ IF( MSVC90 )
+ SET( _RUBY_MSVC_RUNTIME "90" )
+ ENDIF( MSVC90 )
+
+ LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES
+ "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
+ "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
+ "msvcrt-ruby${_RUBY_NODOT_VERSION}"
+ "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
+ENDIF(WIN32)
+
+FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
+
+INCLUDE(FindPackageHandleStandardArgs)
+SET(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
+IF(_RUBY_VERSION_SHORT_NODOT GREATER 18)
+ LIST(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR)
+ENDIF(_RUBY_VERSION_SHORT_NODOT GREATER 18)
+
+IF(_RUBY_DEBUG_OUTPUT)
+ MESSAGE(STATUS "--------FindRuby.cmake debug------------")
+ MESSAGE(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}")
+ MESSAGE(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}")
+ MESSAGE(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}")
+ MESSAGE(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}")
+ MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
+ MESSAGE(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
+ MESSAGE(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
+ MESSAGE(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
+ MESSAGE(STATUS "--------------------")
+ENDIF(_RUBY_DEBUG_OUTPUT)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby DEFAULT_MSG ${_RUBY_REQUIRED_VARS})
+
+MARK_AS_ADVANCED(
+ RUBY_EXECUTABLE
+ RUBY_LIBRARY
+ RUBY_INCLUDE_DIR
+ RUBY_CONFIG_INCLUDE_DIR
+ )
+
+# Set some variables for compatibility with previous version of this file
+SET(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
+SET(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
+SET(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS})
+
--
1.7.1
>From 7c3793360fdb86a51074938fb3e2f3e88f304182 Mon Sep 17 00:00:00 2001
From: Michael Jansen <[email protected]>
Date: Mon, 14 Mar 2011 20:24:09 +0100
Subject: [PATCH 6/6] Use the new FindRuby.cmake file.
---
CMakeLists.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33078b4..6d856cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ project(QtRuby)
cmake_minimum_required(VERSION 2.6)
set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
find_package(Ruby REQUIRED)
find_package(Qt4 REQUIRED)
find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
--
1.7.1
>From 4ef33c5cc802aa8448e561ba88d93307d5948676 Mon Sep 17 00:00:00 2001
From: Michael Jansen <[email protected]>
Date: Mon, 14 Mar 2011 19:16:46 +0100
Subject: [PATCH 2/6] Reorder stuff in the hope it is more readable and understanable then.
---
cmake/FindRuby.cmake | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index 0e36e08..b2756fe 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -61,39 +61,42 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
# query the ruby version
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MAJOR']"
OUTPUT_VARIABLE RUBY_VERSION_MAJOR)
+ SET(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MINOR']"
OUTPUT_VARIABLE RUBY_VERSION_MINOR)
+ SET(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['TEENY']"
OUTPUT_VARIABLE RUBY_VERSION_PATCH)
+ SET(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
- # query the different directories
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']"
- OUTPUT_VARIABLE RUBY_ARCH_DIR)
-
+ # Informations about the system (eg x86_64-linux)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['arch']"
OUTPUT_VARIABLE RUBY_ARCH)
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubyhdrdir']"
- OUTPUT_VARIABLE RUBY_HDR_DIR)
-
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']"
- OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
+ # query the ruby library installation area
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']"
+ OUTPUT_VARIABLE RUBY_ARCH_DIR)
+ SET(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR)
+ SET(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
- # site_ruby
+ # query the ruby site installation area
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']"
OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
+ SET(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']"
OUTPUT_VARIABLE RUBY_SITELIB_DIR)
+ SET(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE)
- # vendor_ruby available ?
+ # query the ruby vendor installation area if available
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
+ SET(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE)
IF(RUBY_HAS_VENDOR_RUBY)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']"
@@ -102,20 +105,18 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']"
OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
ENDIF(RUBY_HAS_VENDOR_RUBY)
+ # Correct here ... or into the if above?
+ SET(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE)
+ SET(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE)
- # save the results in the cache so we don't have to run ruby the next time again
- SET(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
- SET(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
- SET(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
- SET(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
+ # ruby development stuff (headers and directory with libruby.so)
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubyhdrdir']"
+ OUTPUT_VARIABLE RUBY_HDR_DIR)
SET(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9)" FORCE)
+
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']"
+ OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
- SET(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
- SET(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
- SET(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE)
- SET(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE)
- SET(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE)
- SET(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE)
MARK_AS_ADVANCED(
RUBY_ARCH_DIR
--
1.7.1
>From 783d21ddcb1c567d1022a8a065951dab0254c88e Mon Sep 17 00:00:00 2001
From: Michael Jansen <[email protected]>
Date: Mon, 14 Mar 2011 19:59:18 +0100
Subject: [PATCH 3/6] More commenting
---
cmake/FindRuby.cmake | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index b2756fe..6e9ef4c 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -135,7 +135,9 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
)
ENDIF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
-# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
+#
+### IF RUBY_EXECUTABLE IS NOT EXECUTABLE (E.G. CROSS COMPILING)
+#
# try to detect which version we found. This is not too good.
IF(NOT RUBY_VERSION_MAJOR)
# by default assume 1.8.0
@@ -155,7 +157,9 @@ SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
-# Now we know which version we found
+#
+### CHECK IF THE FOUND VERSION SATISFIES THE REQUIRED VERSION
+#
IF(Ruby_FIND_VERSION)
IF(${RUBY_VERSION} VERSION_LESS ${Ruby_FIND_VERSION})
# force running ruby the next time again
@@ -171,6 +175,10 @@ IF(Ruby_FIND_VERSION)
ENDIF(${RUBY_VERSION} VERSION_LESS ${Ruby_FIND_VERSION})
ENDIF(Ruby_FIND_VERSION)
+#
+### FIND THE RUBY INCLUDE DIRECTORY
+#
+# We need this because rubyhdrdir is not always set (ruby 1.8)
FIND_PATH(RUBY_INCLUDE_DIR
NAMES ruby.h
HINTS
@@ -180,7 +188,9 @@ FIND_PATH(RUBY_INCLUDE_DIR
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
-# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
+#
+### FIND THE CONFIG.H FILE (IF > RUBY 1.8)
+#
IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
NAMES ruby/config.h config.h
@@ -193,6 +203,9 @@ IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT
ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
+#
+### FIND THE RUBY LIBRARY
+#
# Determine the list of possible names for the ruby library
SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
@@ -223,6 +236,9 @@ ENDIF(WIN32)
FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
+#
+### CALL FindPackageHandleStandardArgs
+#
INCLUDE(FindPackageHandleStandardArgs)
SET(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
IF(_RUBY_VERSION_SHORT_NODOT GREATER 18)
--
1.7.1
>From 8748c1835dbec6d8fa63e7cec2134f40a3b7e57d Mon Sep 17 00:00:00 2001
From: Michael Jansen <[email protected]>
Date: Mon, 14 Mar 2011 20:21:58 +0100
Subject: [PATCH 4/6] 1st Step: Construct the custom installation area.
---
cmake/FindRuby.cmake | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index 6e9ef4c..b8b75f3 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -176,6 +176,16 @@ IF(Ruby_FIND_VERSION)
ENDIF(Ruby_FIND_VERSION)
#
+### DETERMINE THE CUSTOM INSTALLATION AREA PATH
+#
+set(RUBY_CUSTOMLIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ruby/${_RUBY_VERSION_SHORT}"
+ CACHE PATH "The ruby custom lib dir")
+set(RUBY_CUSTOMARCH_DIR "${RUBY_CUSTOMLIB_DIR}/${RUBY_ARCH}"
+ CACHE PATH "The ruby custom arch dir")
+MARK_AS_ADVANCED(
+ RUBY_CUSTOMARCH_DIR
+ RUBY_CUSTOMLIB_DIR
+ )
### FIND THE RUBY INCLUDE DIRECTORY
#
# We need this because rubyhdrdir is not always set (ruby 1.8)
--
1.7.1
>From 6174756826a6cf7cd1c1784bc5f286c4b0ee2bd8 Mon Sep 17 00:00:00 2001
From: Michael Jansen <[email protected]>
Date: Mon, 14 Mar 2011 20:23:55 +0100
Subject: [PATCH 5/6] 2nd step: Implement the logic
Not there yet. I have no clue how i reliably find out if the cmake installation prefix is the same as the ruby
installation prefix. Are things like --libdir and --exec_prefix (ruby is autoconf) relevant here.
Doc is missing too.
---
cmake/FindRuby.cmake | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index b8b75f3..848eb69 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -186,6 +186,42 @@ MARK_AS_ADVANCED(
RUBY_CUSTOMARCH_DIR
RUBY_CUSTOMLIB_DIR
)
+
+#
+### DETERMINE THE INSTALLATION AREA TO USE
+#
+# A option that can be used to switch between the installation areas.
+set(RUBY_INSTALLATION_AREA "auto" CACHE STRING "The installation area to use for installation of ruby modules (custom|site|vendor).")
+
+if(RUBY_INSTALLATION_AREA STREQUAL "site")
+ message(STATUS "Ruby will use the site installation area.")
+ set(RUBY_INSTALL_LIBDIR ${RUBY_SITELIB_DIR} CACHE PATH "The ruby modules lib installation directory.")
+ set(RUBY_INSTALL_ARCHDIR ${RUBY_SITEARCH_DIR} CACHE PATH "The ruby modules arch installation directory.")
+elseif(RUBY_INSTALLATION_AREA STREQUAL "vendor")
+ message(STATUS "Ruby will use the vendor installation area.")
+ set(RUBY_INSTALL_LIBDIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The ruby modules lib installation directory.")
+ set(RUBY_INSTALL_ARCHDIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The ruby modules arch installation directory.")
+elseif(RUBY_INSTALLATION_AREA STREQUAL "custom")
+ message(STATUS "Ruby will use the custom installation area.")
+ set(RUBY_INSTALL_LIBDIR ${RUBY_CUSTOMLIB_DIR} CACHE PATH "The ruby modules lib installation directory.")
+ set(RUBY_INSTALL_ARCHDIR ${RUBY_CUSTOMARCH_DIR} CACHE PATH "The ruby modules arch installation directory.")
+elseif(RUBY_INSTALLATION_AREA STREQUAL "auto")
+ message(STATUS "WHAT SHOULD I DO HERE. WHICH PATH OF rbconfig.rb SHOULD I COMPARE AGAINST WHICH CMAKE PATH")
+ IF( "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" EQUAL "${RUBY_POSSIBLE_LIB_DIR}" )
+ message(STATUS "Same installation prefix")
+ set(RUBY_INSTALL_LIBDIR ${RUBY_SITELIB_DIR} CACHE PATH "The ruby modules lib installation directory.")
+ set(RUBY_INSTALL_ARCHDIR ${RUBY_SITEARCH_DIR} CACHE PATH "The ruby modules arch installation directory.")
+ ELSE( "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" EQUAL "${RUBY_POSSIBLE_LIB_DIR}" )
+ message(STATUS "Different installation prefix")
+ set(RUBY_INSTALL_LIBDIR ${RUBY_CUSTOMLIB_DIR} CACHE PATH "The ruby modules lib installation directory.")
+ set(RUBY_INSTALL_ARCHDIR ${RUBY_CUSTOMARCH_DIR} CACHE PATH "The ruby modules arch installation directory.")
+ ENDIF( "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" EQUAL "${RUBY_POSSIBLE_LIB_DIR}" )
+else(RUBY_INSTALLATION_AREA STREQUAL "site")
+ message(FATAL_ERROR "Unknown ruby installation area '${RUBY_INSTALLATION_AREA}'.")
+endif(RUBY_INSTALLATION_AREA STREQUAL "site")
+
+
+#
### FIND THE RUBY INCLUDE DIRECTORY
#
# We need this because rubyhdrdir is not always set (ruby 1.8)
--
1.7.1
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
