This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 83cabdf85c8637c76a6afada5a5656fcc9072db5 (commit)
via 59ccf385540709c5c3e9352120f55b8ca90aaf6e (commit)
via ad11118ebf398e2374f1905ebfb4f3fe04cd27cd (commit)
via 4a1aadbb0071467da3e217af1a1413cc3d9d9eca (commit)
from 90a82b7a98247c052e64fb047fc60c8b3759c274 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83cabdf85c8637c76a6afada5a5656fcc9072db5
commit 83cabdf85c8637c76a6afada5a5656fcc9072db5
Merge: 90a82b7 59ccf38
Author: Alexander Neundorf <[email protected]>
AuthorDate: Thu Sep 22 08:43:28 2011 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Thu Sep 22 08:43:28 2011 -0400
Merge topic 'MinorPkgConfigDocImprovement' into next
59ccf38 Minor improvements to the UsePkgConfig.cmake docs
ad11118 Remove trailing whitespace
4a1aadb KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59ccf385540709c5c3e9352120f55b8ca90aaf6e
commit 59ccf385540709c5c3e9352120f55b8ca90aaf6e
Author: Alex Neundorf <[email protected]>
AuthorDate: Thu Sep 22 14:47:18 2011 +0200
Commit: Alex Neundorf <[email protected]>
CommitDate: Thu Sep 22 14:47:18 2011 +0200
Minor improvements to the UsePkgConfig.cmake docs
Alex
diff --git a/Modules/UsePkgConfig.cmake b/Modules/UsePkgConfig.cmake
index 14bbf22..3db9e43 100644
--- a/Modules/UsePkgConfig.cmake
+++ b/Modules/UsePkgConfig.cmake
@@ -1,13 +1,14 @@
-# - obsolete pkg-config module for CMake
+# - Osolete pkg-config module for CMake, use FindPkgConfig instead.
#
-# Defines the following macros:
+# This module defines the following macro:
#
# PKGCONFIG(package includedir libdir linkflags cflags)
#
# Calling PKGCONFIG will fill the desired information into the 4 given
arguments,
# e.g. PKGCONFIG(libart-2.0 LIBART_INCLUDE_DIR LIBART_LINK_DIR
LIBART_LINK_FLAGS LIBART_CFLAGS)
# if pkg-config was NOT found or the specified software package doesn't exist,
the
-# variable will be empty when the function returns, otherwise they will
contain the respective information
+# variable will be empty when the function returns, otherwise they will contain
+# the respective information
#
#=============================================================================
@@ -27,7 +28,7 @@ FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
MESSAGE(STATUS
- "WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig")
+ "WARNING: you are using the obsolete 'PKGCONFIG' macro, use FindPkgConfig")
# reset the variables at the beginning
SET(${_include_DIR})
SET(${_link_DIR})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad11118ebf398e2374f1905ebfb4f3fe04cd27cd
commit ad11118ebf398e2374f1905ebfb4f3fe04cd27cd
Author: Alex Neundorf <[email protected]>
AuthorDate: Thu Sep 22 14:39:19 2011 +0200
Commit: Alex Neundorf <[email protected]>
CommitDate: Thu Sep 22 14:39:19 2011 +0200
Remove trailing whitespace
Alex
diff --git a/Modules/UsePkgConfig.cmake b/Modules/UsePkgConfig.cmake
index d101e61..14bbf22 100644
--- a/Modules/UsePkgConfig.cmake
+++ b/Modules/UsePkgConfig.cmake
@@ -42,20 +42,20 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS
_cflags)
# and if the package of interest also exists for pkg-config, then get the
information
IF(NOT _return_VALUE)
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package}
--variable=includedir
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package}
--variable=includedir
OUTPUT_VARIABLE ${_include_DIR} )
STRING(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
-
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
+
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
OUTPUT_VARIABLE ${_link_DIR} )
STRING(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
OUTPUT_VARIABLE ${_link_FLAGS} )
STRING(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
OUTPUT_VARIABLE ${_cflags} )
STRING(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
@@ -64,10 +64,10 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS
_cflags)
MESSAGE(STATUS "PKGCONFIG() indicates that ${_package} is not installed
(install the package which contains ${_package}.pc if you want to support this
feature)")
ENDIF(NOT _return_VALUE)
-
+
# if pkg-config has NOT been found, INFORM the user
ELSE(PKGCONFIG_EXECUTABLE)
-
+
MESSAGE(STATUS "WARNING: PKGCONFIG() indicates that the tool pkg-config
has not been found on your system. You should install it.")
ENDIF(PKGCONFIG_EXECUTABLE)
-----------------------------------------------------------------------
Summary of changes:
Modules/UsePkgConfig.cmake | 23 ++++++++++++-----------
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 13 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
