Merge branch 'master' into epel7

fixes for epel7
2019-11-21 17:46:11 -07:00 · 2019-11-21 16:52:14 -07:00 · 2019-02-02 00:02:07 -07:00
1 changed files with 4 additions and 1 deletions
--- a/votca-tools.spec
+++ b/votca-tools.spec
@ -45,11 +45,14 @@ This package contains development headers and libraries for votca-tools.

 %prep
 %setup -qn tools-%{version}%{?_rc}
+%if 0%{?rhel}
+sed -i '/Boost/s/1.57.0/1.53.0/' CMakeLists.txt src/tests/CMakeLists.txt
+%endif

 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake} .. -DCMAKE_BUILD_TYPE=Release -DWITH_RC_FILES=OFF -DENABLE_TESTING=ON
+%{cmake3} .. -DCMAKE_BUILD_TYPE=Release -DWITH_RC_FILES=OFF -DENABLE_TESTING=ON
 make %{?_smp_mflags}

 %install
Author	SHA1	Message	Date
Christoph Junghans	95761f7e2a	Merge branch 'master' into epel7	2019-11-21 17:46:11 -07:00
Christoph Junghans	520dbb1abb	Merge branch 'master' into epel7	2019-11-21 16:52:14 -07:00
Christoph Junghans	c21718030a	fixes for epel7	2019-02-02 00:02:07 -07:00