Author: kkaempf Date: Thu May 15 16:22:41 2008 New Revision: 10111 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10111&view=rev Log: set SWIG_INPUT and SWIG_OUTPUT early enough to be picked up by sub-CMakeLists 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=10111&r1=10110&r2=10111&view=diff ============================================================================== --- trunk/sat-solver/bindings/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/CMakeLists.txt Thu May 15 16:22:41 2008 @@ -1,4 +1,15 @@ FIND_PACKAGE(SWIG) + +MESSAGE(STATUS "Found SWIG version ${SWIG_VERSION}") + +# +# Generic setting for all generated bindings +# + +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_wrap.c" ) +SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/satsolver.i" ) + + FIND_PACKAGE(Ruby) FIND_PACKAGE(PythonLibs) @@ -21,9 +32,3 @@ ADD_SUBDIRECTORY(perl) ENDIF (PERL_EXECUTABLE) -# -# Generic setting for all generated bindings -# - -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_wrap.c" ) -SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/satsolver.i" ) Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLists.txt?rev=10111&r1=10110&r2=10111&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Thu May 15 16:22:41 2008 @@ -3,7 +3,6 @@ # # Can't use 'satsolver' here, already taken by src/CMakeLists.txt # - SET( binding_NAME "rbsatsolver" ) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") @@ -19,14 +18,13 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ) - - SET(bindings_SRCS ${SWIG_OUTPUT} "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) ADD_LIBRARY( ${binding_NAME} SHARED ${bindings_SRCS} ) -# don't prefix with 'lib' -SET_TARGET_PROPERTIES( ${binding_NAME} PROPERTIES PREFIX "" ) +# name it 'satsolver.so' +# and don't prefix with 'lib' +SET_TARGET_PROPERTIES( ${binding_NAME} PROPERTIES OUTPUT_NAME "satsolver" PREFIX "" ) INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/applayer ${CMAKE_SOURCE_DIR}/tools ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org