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

Accepting request 610893 from home:mathletic:branches:devel:tools:building

Browse Source 
Fix CMake for Leap 42.3 and SLE 12

OBS-URL: https://build.opensuse.org/request/show/610893
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=325
This commit is contained in:
Martin Pluskal 2018-05-23 07:32:09 +00:00 committed by Git OBS Bridge
parent e17bb59f5f
commit f968105a97
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake-gui.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 20 22:53:46 UTC 2018 - foss@grueninger.de
- Use libuv provided by CMake for Leap 42.3.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 17 20:26:45 UTC 2018 - foss@grueninger.de Thu May 17 20:26:45 UTC 2018 - foss@grueninger.de

10
cmake-gui.spec
View File

@ -37,7 +37,13 @@ BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libarchive-devel >= 3.0.2
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: libuv-devel # exclude for SLE 12 and Leap 42.x
%if 0%{?suse_version} == 1315
%define system_libuv OFF
%else
BuildRequires: libuv-devel >= 1.10
%define system_libuv ON
%endif
BuildRequires: openssl-devel BuildRequires: openssl-devel
# this is commented as it would create dependancy cycle between jsoncpp and cmake # this is commented as it would create dependancy cycle between jsoncpp and cmake
#if 0%{?suse_version} > 1320 #if 0%{?suse_version} > 1320
@ -89,7 +95,7 @@ export CXXFLAGS="%{optflags}"
--verbose \ --verbose \
--qt-gui \ --qt-gui \
-- \ -- \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv}
make VERBOSE=1 %{?_smp_mflags} make VERBOSE=1 %{?_smp_mflags}
%install %install

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 20 22:54:17 UTC 2018 - foss@grueninger.de
- Use libuv provided by CMake for Leap 42.3 and SLE 12.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 17 20:26:30 UTC 2018 - foss@grueninger.de Thu May 17 20:26:30 UTC 2018 - foss@grueninger.de

10
cmake.spec
View File

@ -50,7 +50,13 @@ BuildRequires: libcurl-mini-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%endif %endif
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: libuv-devel # exclude for SLE 12 and Leap 42.x
%if 0%{?suse_version} == 1315
%define system_libuv OFF
%else
BuildRequires: libuv-devel >= 1.10
%define system_libuv ON
%endif
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
# this is commented as it would create dependancy cycle between jsoncpp and cmake # this is commented as it would create dependancy cycle between jsoncpp and cmake
#if 0%{?suse_version} > 1320 #if 0%{?suse_version} > 1320
@ -90,7 +96,7 @@ export CXXFLAGS="%{optflags}"
--verbose \ --verbose \
--no-qt-gui \ --no-qt-gui \
-- \ -- \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv}
make VERBOSE=1 %{?_smp_mflags} make VERBOSE=1 %{?_smp_mflags}
%install %install