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

Accepting request 116363 from devel:tools:building

Browse Source 
- Add cmake-pkgconfig.patch to fix cmake bug #13125 (forwarded request 115228 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/116363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=55
This commit is contained in:
Stephan Kulow 2012-05-08 10:09:19 +00:00 committed by Git OBS Bridge
commit a32b6630fa
3 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cmake-pkgconfig.patch Normal file
View File

@ -0,0 +1,44 @@
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 5d93ab1..3090fa3 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -13,11 +13,10 @@
# When the 'QUIET' argument is set, no status messages will be printed.
#
# It sets the following variables:
-# PKG_CONFIG_FOUND ... true if pkg-config works on the system
+# PKG_CONFIG_FOUND ... if pkg-config executable was found
# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
# PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
# (since CMake 2.8.8)
-# PKG_CONFIG_FOUND ... if pkg-config executable was found
#
# For the following variables two sets of values exist; first one is the
# common one and has the given PREFIX. The second set contains flags
@@ -100,7 +99,7 @@ if (PKG_CONFIG_EXECUTABLE)
endif (PKG_CONFIG_EXECUTABLE)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(PkgConfig
+find_package_handle_standard_args(PKG_CONFIG
REQUIRED_VARS PKG_CONFIG_EXECUTABLE
VERSION_VAR PKG_CONFIG_VERSION_STRING)
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 6604208..fc65e58 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -71,7 +71,7 @@ endmacro(check_version_string)
# reported.
foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
+ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
endforeach(VTEST)
@@ -82,4 +82,3 @@ endforeach(VTEST)
check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
check_version_string(SUBVERSION Subversion_VERSION_SVN)
-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 24 15:11:45 UTC 2012 - idonmez@suse.com
- Add cmake-pkgconfig.patch to fix cmake bug #13125
-------------------------------------------------------------------
Wed Apr 18 23:00:30 UTC 2012 - cgiboudeaux@gmx.com

7
cmake.spec
View File

@ -21,8 +21,8 @@ Version: 2.8.8
Release: 0
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
Patch4: cmake-disable-builtin-chrpath.diff
# Should appear in cmake-2.8.3
Patch1: cmake-disable-builtin-chrpath.diff
Patch2: cmake-pkgconfig.patch
Summary: Cross-platform, open-source make system
License: BSD-3-Clause
Group: Development/Tools/Building
@ -50,7 +50,8 @@ CMake is a cross-platform, open-source make system
%prep
%setup -q
%patch4
%patch1
%patch2 -p1
%build
export CXXFLAGS="$RPM_OPT_FLAGS"