Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7664 - in /trunk/sat-solver/bindings: CMakeLists.txt ruby/CMakeLists.txt
  • From: dmacvicar@xxxxxxxxxxxxxxxx
  • Date: Fri, 26 Oct 2007 16:50:04 -0000
  • Message-id: <20071026165004.39B471739B@xxxxxxxxxxxxxxxx>
Author: dmacvicar
Date: Fri Oct 26 18:50:03 2007
New Revision: 7664

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7664&view=rev
Log:
make ruby optional

Modified:
trunk/sat-solver/bindings/CMakeLists.txt
trunk/sat-solver/bindings/ruby/CMakeLists.txt

Modified: trunk/sat-solver/bindings/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/CMakeLists.txt?rev=7664&r1=7663&r2=7664&view=diff
==============================================================================
--- trunk/sat-solver/bindings/CMakeLists.txt (original)
+++ trunk/sat-solver/bindings/CMakeLists.txt Fri Oct 26 18:50:03 2007
@@ -1 +1,5 @@
-ADD_SUBDIRECTORY(ruby)
\ No newline at end of file
+FIND_PACKAGE(Ruby)
+
+IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+ ADD_SUBDIRECTORY(ruby)
+ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
\ No newline at end of file

Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLists.txt?rev=7664&r1=7663&r2=7664&view=diff
==============================================================================
--- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original)
+++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Fri Oct 26 18:50:03 2007
@@ -1,8 +1,6 @@
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

-FIND_PACKAGE(Ruby REQUIRED)
-
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print
Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR)

MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}")

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages