Bump to libzypp-bindings 0.7.4

[platform/upstream/libzypp-bindings.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdba5e0..30b0841 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,11 @@
 #
 #
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 ENABLE_TESTING()
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-strict-aliasing")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -fPIC -fno-strict-aliasing")
 
 #
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
@@ -48,10 +48,10 @@ FIND_PACKAGE(Zypp REQUIRED)
 
 # determine zypp version
 FIND_PROGRAM(READ_LINK readlink)
-EXECUTE_PROCESS(COMMAND "${READ_LINK}" ${ZYPP_LIBRARY} OUTPUT_VARIABLE ZYPP_SOFILE)
+EXECUTE_PROCESS(COMMAND "${READ_LINK}" "-f" ${ZYPP_LIBRARY} OUTPUT_VARIABLE ZYPP_SOFILE)
 
 # match number at end, strip trailing \n by using a sub-match
-STRING(REGEX MATCH "([0-9]+)\n$" ZYPP_VERSION "${ZYPP_SOFILE}")
+STRING(REGEX MATCH "([0-9]+)\\.[0-9]+\\.[0-9]+\n$" ZYPP_VERSION "${ZYPP_SOFILE}")
 SET( ZYPP_VERSION "${CMAKE_MATCH_1}" )
 MESSAGE(STATUS "Zypp so library version ${ZYPP_VERSION}")
 
@@ -66,7 +66,7 @@ FIND_PATH( BOOST_SMARTPTR_INCLUDE_DIR boost/smart_ptr/shared_ptr.hpp
        /usr/local/include
 )
 IF( BOOST_SMARTPTR_INCLUDE_DIR )
-       SET( SWIG_DEFINITIONS ${SWIG_DEFINITIONS} -DBOOST_SMARTPTR_INCLUDE_DIR )
+       SET( SWIG_DEFINITIONS ${SWIG_DEFINITIONS} -I${BOOST_SMARTPTR_INCLUDE_DIR} -DBOOST_SMARTPTR_INCLUDE_DIR )
 ENDIF( BOOST_SMARTPTR_INCLUDE_DIR )
 
 # Now into SWIG