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

Accepting request 327809 from home:tittiatcoke:branches:devel:tools:building

Browse Source 
Resolves build errors when the cmake_minimum_required() is not set in the CMakeLists.txt.

OBS-URL: https://build.opensuse.org/request/show/327809
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=225
This commit is contained in:
Hrvoje Senjan 2015-08-28 21:03:25 +00:00 committed by Git OBS Bridge
parent 2b638e4513
commit 86a9e08665
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch Normal file
View File

@ -0,0 +1,40 @@
From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Tue, 18 Aug 2015 12:14:43 +0200
Subject: [PATCH] FindPkgConfig: remove variable dereference
If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
cmake_minimum_required() call is present this line can lead to an error as that
string is empty so too few arguments are passed to if():
See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
given arguments:
"VERSION_LESS" "3.1"
Unknown arguments specified
Call Stack (most recent call first):
/usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
/usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
---
Modules/FindPkgConfig.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 526a62e..ae6903e 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
set(${_no_cmake_path} 1)
set(${_no_cmake_environment_path} 1)
endif()
- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
set(${_no_cmake_path} 1)
set(${_no_cmake_environment_path} 1)
endif()
--
1.7.10.4

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 28 20:48:10 UTC 2015 - tittiatcoke@gmail.com
- Resolve the error when cmake_minimum_required() is not set
* cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
-------------------------------------------------------------------
Fri Aug 14 20:56:51 UTC 2015 - astieger@suse.com

3
cmake.spec
View File

@ -36,6 +36,8 @@ Patch2: cmake-fix-ruby-test.patch
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch
# PATCH-FIX-UPSTREAM cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch - Resolve the issue when cmake:minimum_required is not set
Patch6: cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -67,6 +69,7 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
export CXXFLAGS="%{optflags}"