[zypp-commit] <sat-solver> master : - forgot to adapt ruby/python bindings

ref: refs/heads/master commit e4e093e21e9dfda7afa4633586e94602bf321956 Author: Michael Schroeder Date: Mon Jun 22 12:54:17 2009 +0200 - forgot to adapt ruby/python bindings --- bindings/python/CMakeLists.txt | 4 ++-- bindings/ruby/CMakeLists.txt | 4 ++-- tools/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 60fe194..6f19611 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -32,7 +32,7 @@ ADD_CUSTOM_COMMAND ( DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ) -SET(binding_SRCS "${SWIG_OUTPUT}" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) +SET(binding_SRCS "${SWIG_OUTPUT}" "${CMAKE_SOURCE_DIR}/ext/repo_rpmdb.c" ) # Py_True and Py_False are a bit tricky ADD_DEFINITIONS( -fno-strict-aliasing ) @@ -42,7 +42,7 @@ ADD_LIBRARY( satsolver_python SHARED ${binding_SRCS} ) # and don't prefix with 'lib' SET_TARGET_PROPERTIES( satsolver_python PROPERTIES PREFIX "" OUTPUT_NAME "_satsolver") -INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/applayer ${CMAKE_SOURCE_DIR}/tools ) +INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/applayer ${CMAKE_SOURCE_DIR}/ext ) TARGET_LINK_LIBRARIES( satsolver_python satsolver ) TARGET_LINK_LIBRARIES( satsolver_python appsatsolver ) diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt index 82a8221..1c33d8c 100644 --- a/bindings/ruby/CMakeLists.txt +++ b/bindings/ruby/CMakeLists.txt @@ -22,7 +22,7 @@ ADD_CUSTOM_COMMAND ( DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ) -SET(bindings_SRCS ${SWIG_OUTPUT} "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) +SET(bindings_SRCS ${SWIG_OUTPUT} "${CMAKE_SOURCE_DIR}/ext/repo_rpmdb.c" ) ADD_LIBRARY( satsolver_ruby SHARED ${bindings_SRCS} ) @@ -30,7 +30,7 @@ ADD_LIBRARY( satsolver_ruby SHARED ${bindings_SRCS} ) # and don't prefix with 'lib' SET_TARGET_PROPERTIES( satsolver_ruby PROPERTIES OUTPUT_NAME "satsolver" PREFIX "" ) -INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/applayer ${CMAKE_SOURCE_DIR}/tools ) +INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/applayer ${CMAKE_SOURCE_DIR}/ext ) TARGET_LINK_LIBRARIES( satsolver_ruby satsolver ) TARGET_LINK_LIBRARIES( satsolver_ruby appsatsolver ) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 6502f4a..0ed2fed 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -2,7 +2,7 @@ # CMakeLists.txt for sat-solver/tools # -ADD_LIBRARY( toolstuff STATIC common_write.c ) +ADD_LIBRARY(toolstuff STATIC common_write.c) ADD_EXECUTABLE(rpmdb2solv rpmdb2solv.c) TARGET_LINK_LIBRARIES(rpmdb2solv toolstuff satsolverext satsolver ${RPMDB_LIBRARY} ${EXPAT_LIBRARY}) @@ -13,7 +13,7 @@ TARGET_LINK_LIBRARIES(rpms2solv toolstuff satsolverext satsolver ${RPMDB_LIBRARY ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c) TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -ADD_EXECUTABLE(helix2solv helix2solv.c ${helix2solv_REPOS} ) +ADD_EXECUTABLE(helix2solv helix2solv.c) TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) ADD_EXECUTABLE(susetags2solv susetags2solv.c) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org