Author: kkaempf Date: Thu Apr 2 14:10:44 2009 New Revision: 56575 URL: http://svn.opensuse.org/viewcvs/yast?rev=56575&view=rev Log: add comments use YAST_PLUGIN_DIR Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeLists.txt?rev=56575&r1=56574&r2=56575&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Thu Apr 2 14:10:44 2009 @@ -29,20 +29,32 @@ Y2RubyTypeTerm.h ) +# +# Use rpath to find YaST plugin libs +# +# ref. http://www.cmake.org/Wiki/CMake_RPATH_handling + # skip the full RPATH for the build tree SET(CMAKE_SKIP_BUILD_RPATH TRUE) # when building, use the install RPATH already # (so it doesn't need to relink when installing) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) # the RPATH to be used when installing -SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}/YaST2/plugins") +SET(CMAKE_INSTALL_RPATH "${YAST_PLUGIN_DIR}") # add the automatically determined parts of the RPATH # which point to directories outside the build tree to the install RPATH SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) - + +LINK_DIRECTORIES(${YAST_PLUGIN_DIR}) + +# +# Ruby -> YCP +# ycp.rb + ycpx.so +# + ADD_LIBRARY( ycpx SHARED ${yast_ruby_module_SRCS}) SET_TARGET_PROPERTIES( ycpx PROPERTIES PREFIX "" ) TARGET_LINK_LIBRARIES( ycpx ${YAST_LIBRARY} ) @@ -54,6 +66,11 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ycp.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) +# +# YCP -> Ruby +# libpy2lang_ruby +# + ADD_LIBRARY( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_LIBRARY} ) TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_YCP_LIBRARY} ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org