Hello community, here is the log from the commit of package SimGear for openSUSE:Factory checked in at 2019-10-16 09:17:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SimGear (Old) and /work/SRC/openSUSE:Factory/.SimGear.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SimGear" Wed Oct 16 09:17:34 2019 rev:13 rq:738484 version:2018.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-08-22 10:58:09.201653337 +0200 +++ /work/SRC/openSUSE:Factory/.SimGear.new.2352/SimGear.changes 2019-10-16 09:17:34.683113030 +0200 @@ -1,0 +2,8 @@ +Thu Sep 26 11:41:34 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix build with cmake 3.15 due to https://cmake.org/cmake/help/v3.15/policy/CMP0093.html + 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch +- Use system expat and udns libraries +- Enable OpenMP support + +------------------------------------------------------------------- New: ---- 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SimGear.spec ++++++ --- /var/tmp/diff_new_pack.Pvoh7q/_old 2019-10-16 09:17:35.167111782 +0200 +++ /var/tmp/diff_new_pack.Pvoh7q/_new 2019-10-16 09:17:35.167111782 +0200 @@ -35,20 +35,20 @@ Patch1: 0001-Remove-deprecated-boost-utility.patch # PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch Patch2: 0001-boost-enable_if-Support-Boost-versions-1.56.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libOpenSceneGraph-devel < 3.6 BuildConflicts: libOpenSceneGraph-devel < 3.2 +BuildRequires: libboost_headers-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(zlib) -%if 0%{?suse_version} > 1330 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +BuildRequires: udns-devel %description SimGear is a set of open-source libraries designed to be used as building @@ -75,14 +75,11 @@ Summary: Development libraries and headers for SimGear Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} -%if 0%{?suse_version} > 1330 BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif Requires: libOpenSceneGraph-devel = %{openscenegraph_version} Requires: libjpeg-devel Requires: openal-soft-devel +Requires: udns-devel Requires: zlib-devel %description devel @@ -93,6 +90,7 @@ %setup -q -n simgear-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="%{optflags}" @@ -100,8 +98,12 @@ # configure to build shared simgear libraries %cmake \ -DSIMGEAR_SHARED:BOOL=ON \ + -DSYSTEM_EXPAT:BOOL=ON \ + -DSYSTEM_UDNS:BOOL=ON \ + -DENABLE_OPENMP:BOOL=ON \ -DENABLE_TESTS:BOOL=OFF -make %{?_smp_mflags} + +%cmake_build %install %cmake_install ++++++ 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch ++++++ >From efc88b61330961965decc7a8d33310327c3306f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Mon, 14 Oct 2019 20:30:35 +0200 Subject: [PATCH] Always add PROJECT_BINARY_DIR to include_directories The directory is added by BoostTestTargets.cmake when Boost is found, but due to a bug in the file it fails to detect boost even when it is available. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a2f59f..3cb28ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -520,6 +520,7 @@ include(CheckCXXFeatures) # use BEFORE to ensure local directories are used first, # ahead of system-installed libs include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear) +include_directories(BEFORE ${PROJECT_BINARY_DIR}) add_definitions(-DHAVE_CONFIG_H) -- 2.23.0
