testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 417823 from home:badshah400:branches:science

Browse Source 
- Add cmake-hdf5-detection.patch to fix detection of hdf5 with
  cmake >= 3.6
  (https://gitlab.kitware.com/cmake/cmake/issues/16225).

OBS-URL: https://build.opensuse.org/request/show/417823
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=260
This commit is contained in:
Ismail Dönmez 2016-08-08 12:32:09 +00:00 committed by Git OBS Bridge
parent 37b4ee7893
commit dae1684bd1
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmake-hdf5-detection.patch Normal file
View File

@ -0,0 +1,26 @@
From 8eb0b56c2ace0f005cba436268337f509e06033f Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 2 Aug 2016 10:34:51 -0400
Subject: [PATCH] FindHDF5: Make sure compile definition vars keep the -D flag
---
Modules/FindHDF5.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 50e1892..a898386 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -332,7 +332,7 @@ macro( _HDF5_parse_compile_line
set( RE " -D([^ ]*)")
string( REGEX MATCHALL "${RE}" definition_flags "${${compile_line_var}}" )
foreach( DEF IN LISTS definition_flags )
- string( REGEX REPLACE "${RE}" "\\1" DEF "${DEF}" )
+ string( STRIP "${DEF}" DEF )
list( APPEND ${definitions} ${DEF} )
endforeach()
--
libgit2 0.24.0

7
cmake.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 8 00:18:51 UTC 2016 - badshah400@gmail.com
- Add cmake-hdf5-detection.patch to fix detection of hdf5 with
cmake >= 3.6
(https://gitlab.kitware.com/cmake/cmake/issues/16225).
-------------------------------------------------------------------
Sun Jul 24 12:53:26 UTC 2016 - foss@grueninger.de

3
cmake.spec
View File

@ -38,6 +38,8 @@ Patch4: form.patch
Patch5: system-libs.patch
# PATCH-FIX-UPSTREAM cmake-version-in-generated-files.patch -- version number to be found in OBS
Patch6: cmake-version-in-generated-files.patch
# PATCH-FIX-UPSTREAM cmake-hdf5-detection.patch badshah400@gmail.com -- Fix hdf5 detection with cmake >= 3.6 (https://gitlab.kitware.com/cmake/cmake/issues/16225)
Patch7: cmake-hdf5-detection.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -70,6 +72,7 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
# FIXME: you should use the %%configure macro