to cmake 2.6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index daf52f8..191d0be 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+cmake_minimum_required(VERSION 2.6)
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH})
@@ -33,7 +33,6 @@ SET (CPACK_SOURCE_IGNORE_FILES
 
 INCLUDE(CPack)
 
-#FIND_PACKAGE(SWIG REQUIRED)
 MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
 FIND_PROGRAM(SWIG_EXECUTABLE
   NAMES swig-1.3 swig
@@ -73,4 +72,3 @@ ADD_CUSTOM_TARGET( srcpackage
 
 MESSAGE(STATUS "Writing spec file...")
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp-bindings.spec.cmake ${CMAKE_BINARY_DIR}/package/libzypp-bindings.spec @ONLY)
-

diff --git a/swig/perl5/CMakeLists.txt b/swig/perl5/CMakeLists.txt
index 2a7f481..ec8815d 100644 (file)
--- a/swig/perl5/CMakeLists.txt
+++ b/swig/perl5/CMakeLists.txt
@@ -1,3 +1,6 @@
+# cmake likes unique target names
+SET(WRAP perl)
+
 FIND_PACKAGE(Perl REQUIRED)
 
 EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS)
@@ -24,18 +27,18 @@ ADD_CUSTOM_COMMAND (
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i
 )
 
-ADD_CUSTOM_TARGET( glue
+ADD_CUSTOM_TARGET( ${WRAP}_glue
    DEPENDS ${SWIG_OUTPUT}
 )
 
-ADD_LIBRARY( zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
-SET_TARGET_PROPERTIES( zypp PROPERTIES PREFIX "" )
-ADD_DEPENDENCIES( zypp glue )
+ADD_LIBRARY( ${WRAP}_zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
+SET_TARGET_PROPERTIES( ${WRAP}_zypp PROPERTIES PREFIX "" )
+ADD_DEPENDENCIES( ${WRAP}_zypp ${WRAP}_glue )
 
 INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} )
 INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
-TARGET_LINK_LIBRARIES( zypp ${ZYPP_LIBRARY} )
+TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${ZYPP_LIBRARY} )
 
-INSTALL(TARGETS zypp LIBRARY DESTINATION ${PERL_INS_PATH})
+INSTALL(TARGETS ${WRAP}_zypp LIBRARY DESTINATION ${PERL_INS_PATH})
 INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.pm DESTINATION ${PERL_INS_PATH})
 

diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index c48fd2a..25fe7f7 100644 (file)
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -1,3 +1,5 @@
+# cmake likes unique target names
+SET(WRAP python)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 
@@ -22,18 +24,18 @@ ADD_CUSTOM_COMMAND (
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i
 )
 
-ADD_CUSTOM_TARGET( glue
+ADD_CUSTOM_TARGET( ${WRAP}_glue
    DEPENDS ${SWIG_OUTPUT}
 )
 
-ADD_LIBRARY( _zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
-SET_TARGET_PROPERTIES( _zypp PROPERTIES PREFIX "" )
-ADD_DEPENDENCIES( _zypp glue )
+ADD_LIBRARY( ${WRAP}_zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
+SET_TARGET_PROPERTIES( ${WRAP}_zypp PROPERTIES PREFIX "" )
+ADD_DEPENDENCIES( ${WRAP}_zypp ${WRAP}_glue )
 
 INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
 INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
-TARGET_LINK_LIBRARIES( _zypp ${ZYPP_LIBRARY} )
+TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${ZYPP_LIBRARY} )
 
-INSTALL(TARGETS _zypp LIBRARY DESTINATION ${PYTHON_LIB_PATH})
+INSTALL(TARGETS ${WRAP}_zypp LIBRARY DESTINATION ${PYTHON_LIB_PATH})
 INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.py DESTINATION ${PYTHON_LIB_PATH})
 

diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt
index ee7027a..b58bc63 100644 (file)
--- a/swig/ruby/CMakeLists.txt
+++ b/swig/ruby/CMakeLists.txt
@@ -1,3 +1,5 @@
+# cmake likes unique target names
+SET(WRAP ruby)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 
@@ -21,18 +23,18 @@ ADD_CUSTOM_COMMAND (
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i
 )
 
-ADD_CUSTOM_TARGET( glue
+ADD_CUSTOM_TARGET( ${WRAP}_glue
    DEPENDS ${SWIG_OUTPUT}
 )
 
-ADD_LIBRARY( zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
-SET_TARGET_PROPERTIES( zypp PROPERTIES PREFIX "" )
-ADD_DEPENDENCIES( zypp glue )
+ADD_LIBRARY( ${WRAP}_zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
+SET_TARGET_PROPERTIES( ${WRAP}_zypp PROPERTIES PREFIX "" )
+ADD_DEPENDENCIES( ${WRAP}_zypp ${WRAP}_glue )
 
 INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} )
 INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
-TARGET_LINK_LIBRARIES( zypp ${ZYPP_LIBRARY} )
-TARGET_LINK_LIBRARIES( zypp ${RUBY_LIBRARY} )
+TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${ZYPP_LIBRARY} )
+TARGET_LINK_LIBRARIES( ${WRAP}_zypp ${RUBY_LIBRARY} )
 
-INSTALL(TARGETS zypp LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR})
+INSTALL(TARGETS ${WRAP}_zypp LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR})