diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | libzypp-bindings.spec.cmake | 3 | ||||
| -rw-r--r-- | package/libzypp-bindings.changes | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c55386..0aced31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,16 +3,11 @@ # # -cmake_minimum_required(VERSION 2.6) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0017 NEW) -endif(COMMAND cmake_policy) - +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} -fPIC -fno-strict-aliasing -std=c++0x") # # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked @@ -53,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}") diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 3697e65..474884f 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -17,7 +17,8 @@ License: GPL v2 or later Summary: Bindings for libzypp Group: Development/Sources BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake gcc-c++ python-devel ruby-devel +BuildRequires: cmake python-devel ruby-devel +BuildRequires: gcc-c++ >= 4.5 BuildRequires: swig >= 1.3.40 BuildRequires: libzypp-devel >= 5.8.0 Source: %{name}-%{version}.tar.bz2 diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 327ca10..2a80a41 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 11 13:46:06 CEST 2011 - ma@suse.de + +- Use gcc-c++ >= 4.5 + +------------------------------------------------------------------- Wed Feb 23 10:59:25 UTC 2011 - coolo@novell.com - disable use of %jobs to avoid swapping during compilation |