[GeographicLib/epel7] Remove incompatible INTERFACE_INCLUDE_DIRECTORIES property
rmattes
rmattes at fedoraproject.org
Sat Jan 3 17:43:49 UTC 2015
commit d732da1ff7d9e1a479eef3d97b51114ff79d3eb0
Author: Rich Mattes <richmattes at gmail.com>
Date: Sat Jan 3 12:43:58 2015 -0500
Remove incompatible INTERFACE_INCLUDE_DIRECTORIES property
GeographicLib-1.40-cmakeversion.patch | 12 ++++++++++++
GeographicLib.spec | 4 ++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/GeographicLib-1.40-cmakeversion.patch b/GeographicLib-1.40-cmakeversion.patch
new file mode 100644
index 0000000..789bfba
--- /dev/null
+++ b/GeographicLib-1.40-cmakeversion.patch
@@ -0,0 +1,12 @@
+diff -up ./src/CMakeLists.txt.cmakeversion ./src/CMakeLists.txt
+--- ./src/CMakeLists.txt.cmakeversion 2015-01-03 12:41:22.322627514 -0500
++++ ./src/CMakeLists.txt 2015-01-03 12:41:37.578208494 -0500
+@@ -54,7 +54,7 @@ else ()
+ endif ()
+ endif ()
+
+-if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
++if (CMAKE_VERSION VERSION_GREATER 2.8.11)
+ if (GEOGRAPHICLIB_SHARED_LIB)
+ target_include_directories (${PROJECT_SHARED_LIBRARIES} INTERFACE
+ $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
diff --git a/GeographicLib.spec b/GeographicLib.spec
index ca68f08..bd0df32 100644
--- a/GeographicLib.spec
+++ b/GeographicLib.spec
@@ -16,6 +16,9 @@ Patch1: %{name}-1.40-rpath.patch
# Install cmake files to datadir/prooject/cmake
# Not submitted upstream
Patch2: %{name}-1.38-cmakeinstall.patch
+# Fix compatibility logic for interface include dir
+# Not submitted upstream
+Patch3: %{name}-1.40-cmakeversion.patch
BuildRequires: cmake
BuildRequires: doxygen
@@ -62,6 +65,7 @@ A translation of the GeographicLib::Geodesic class to Python
%patch0 -p0 -b .python
%patch1 -p0 -b .rpath
%patch2 -p0 -b .cmakeinstall
+%patch3 -p0 -b .cmakeversion
%build
mkdir build; pushd build;
More information about the scm-commits
mailing list