Author: kkaempf Date: Tue May 27 11:36:01 2008 New Revision: 10233 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10233&view=rev Log: make building the bindings more robust Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt trunk/sat-solver/bindings/python/CMakeLists.txt trunk/sat-solver/bindings/ruby/CMakeLists.txt Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/perl/CMakeLists.txt?rev=10233&r1=10232&r2=10233&view=diff ============================================================================== --- trunk/sat-solver/bindings/perl/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/perl/CMakeLists.txt Tue May 27 11:36:01 2008 @@ -10,7 +10,7 @@ ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_swig.c" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_perl.c" ) EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{ccflags}" OUTPUT_VARIABLE PERL_CCFLAGS) EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlib}.\"/CORE\"" OUTPUT_VARIABLE PERL_CORE_DIR) @@ -52,7 +52,7 @@ TARGET_LINK_LIBRARIES( satsolver_perl satsolver ) TARGET_LINK_LIBRARIES( satsolver_perl appsatsolver ) -TARGET_LINK_LIBRARIES( satsolver_perl perl ) +TARGET_LINK_LIBRARIES( satsolver_perl ${PERL_LIBRARY} ) TARGET_LINK_LIBRARIES( satsolver_perl ${RPMDB_LIBRARY} ) INSTALL(TARGETS satsolver_perl LIBRARY DESTINATION ${PERL_VENDOR_ARCH} ) Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMakeLists.txt?rev=10233&r1=10232&r2=10233&view=diff ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Tue May 27 11:36:01 2008 @@ -2,15 +2,15 @@ # cmake description for satsolver Python bindings # # !!Attn!!: This creates two files -# 1. ${binding_NAME}.so -# 2. satsolverx.py +# 1. satsolver.so +# 2. satsolver.py # and the .py file gets imported. See bindings/python/tests. # ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_swig.c" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_python.c" ) FIND_PACKAGE(PythonInterp) @@ -32,7 +32,7 @@ SET(binding_SRCS "${SWIG_OUTPUT}" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) ADD_LIBRARY( satsolver_python SHARED ${binding_SRCS} ) -# name it 'satsolver.so' +# name it '_satsolver.so' # and don't prefix with 'lib' SET_TARGET_PROPERTIES( satsolver_python PROPERTIES PREFIX "" OUTPUT_NAME "_satsolver") Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLists.txt?rev=10233&r1=10232&r2=10233&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Tue May 27 11:36:01 2008 @@ -2,7 +2,7 @@ # SWIG_OUPUT is per-target -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_swig.c" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_ruby.c" ) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDORARCH_DIR}") -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org