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

Accepting request 440783 from home:simotek:branches:devel:tools:building

Browse Source 
Fix typo'd version number, apply the same libuv change to cmake-gui

OBS-URL: https://build.opensuse.org/request/show/440783
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=276
This commit is contained in:
Simon Lees 2016-11-18 03:18:32 +00:00 committed by Git OBS Bridge
parent bbdafe840f
commit 26a5163b02
3 changed files with 18 additions and 2 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 @@
-------------------------------------------------------------------
Thu Nov 17 21:25:36 UTC 2016 - sflees@suse.de
- Fix typo in libuv detection
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 16 14:28:58 UTC 2016 - foss@grueninger.de Wed Nov 16 14:28:58 UTC 2016 - foss@grueninger.de

13
cmake-gui.spec
View File

@ -37,6 +37,14 @@ BuildRequires: gcc-c++
BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libarchive-devel >= 3.0.2
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
# use libuv package for Leap and Tumbleweed
%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}))
BuildRequires: libuv-devel
%define use_system_uvlib ON
# otherwise use libuv part of CMake tarball
%else
%define use_system_uvlib OFF
%endif
# 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
#BuildRequires: pkgconfig(jsoncpp) #BuildRequires: pkgconfig(jsoncpp)
@ -84,7 +92,10 @@ export CXXFLAGS="%{optflags}"
--system-libs \ --system-libs \
--no-system-jsoncpp \ --no-system-jsoncpp \
--parallel=0%{jobs} \ --parallel=0%{jobs} \
--qt-gui --verbose \
--qt-gui \
-- \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib}
make VERBOSE=1 %{?_smp_mflags} make VERBOSE=1 %{?_smp_mflags}
%install %install

2
cmake.spec
View File

@ -43,7 +43,7 @@ BuildRequires: libarchive-devel >= 3.0.2
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
# use libuv package for Leap and Tumbleweed # use libuv package for Leap and Tumbleweed
%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1320 && 0%{?is_opensuse})) %if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}))
BuildRequires: libuv-devel BuildRequires: libuv-devel
%define use_system_uvlib ON %define use_system_uvlib ON
# otherwise use libuv part of CMake tarball # otherwise use libuv part of CMake tarball