88417dd117
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=41
59 lines
1.4 KiB
Diff
59 lines
1.4 KiB
Diff
From 3f6e116314e13c0a7126ab234fe32dd8a5e31658 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@cryptomilk.org>
|
|
Date: Wed, 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
|
|
|
|
|
|
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 2/2] 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
|
|
|