diff --git a/0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch b/0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch new file mode 100644 index 0000000..2497317 --- /dev/null +++ b/0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch @@ -0,0 +1,32 @@ +0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch +0002-cmake-VERSION_GREATER_EQUAL-is-not-suppored-by-cmake.patch +, 29 Aug 2018 21:49:08 +0200 +Subject: [PATCH 1/2] cmake: Only support building docs the on cmake >= 3.9 + +Fixes #2 +--- + doc/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 4e3dc23..24ed569 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -1,6 +1,8 @@ + # + # Build the documentation + # ++if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.9.0") ++ + find_package(Doxygen) + + if (DOXYGEN_FOUND) +@@ -39,3 +41,5 @@ if (DOXYGEN_FOUND) + ${cmocka-headers_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}) + endif(DOXYGEN_FOUND) ++ ++endif() # CMAKE_VERSION +-- +2.18.0 + diff --git a/0001-cmake-VERSION_GREATER_EQUAL-is-not-suppored-by-cmake.patch b/0001-cmake-VERSION_GREATER_EQUAL-is-not-suppored-by-cmake.patch deleted file mode 100644 index 93571ef..0000000 --- a/0001-cmake-VERSION_GREATER_EQUAL-is-not-suppored-by-cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4114b15f01953cbe01c4cbc2018cb982815cb566 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 30 Aug 2018 07:35:22 +0200 -Subject: [PATCH] cmake: VERSION_GREATER_EQUAL is not suppored by cmake 3.3 - ---- - doc/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 24ed569..8c3426f 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1,7 +1,7 @@ - # - # Build the documentation - # --if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.9.0") -+if (${CMAKE_VERSION} VERSION_GREATER "3.8.99") - - find_package(Doxygen) - --- -2.18.0 - diff --git a/cmocka.changes b/cmocka.changes index 5f72b6c..493dbfa 100644 --- a/cmocka.changes +++ b/cmocka.changes @@ -2,7 +2,7 @@ Thu Aug 30 08:04:05 UTC 2018 - Andreas Schneider - Fix packaging the documentation -- Added 0001-cmake-VERSION_GREATER_EQUAL-is-not-suppored-by-cmake.patch +- Added 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch ------------------------------------------------------------------- Wed Aug 29 15:15:03 UTC 2018 - Andreas Schneider