pool/cmocka
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=39
This commit is contained in:
Andreas Schneider 2018-08-30 08:42:09 +00:00 committed by Git OBS Bridge
parent 540d914817
commit c172611e65
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch Normal file
View File

@ -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

25
0001-cmake-VERSION_GREATER_EQUAL-is-not-suppored-by-cmake.patch
View File

@ -1,25 +0,0 @@
From 4114b15f01953cbe01c4cbc2018cb982815cb566 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
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

2
cmocka.changes
View File

@ -2,7 +2,7 @@
Thu Aug 30 08:04:05 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>
- 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 <asn@cryptomilk.org>