[Cmake-commits] CMake branch, next, updated. v2.8.9-416-gec5b047
Rolf Eike Beer
eike at sf-mail.de
Sat Sep 8 13:03:49 EDT 2012
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 ec5b04781d14ee70ef1424a6f8e52ade40495cfe (commit)
via 4ed758ec127b44c0877d414c7501538b7a6992f7 (commit)
via d35f552614014525b1de543dfe36be5e337a11d1 (commit)
via 308564e35caecd6cf04137609963cd3d93e578c0 (commit)
from 9d7c77e2eb24ca7a8292001fb0cdafd87903951c (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=ec5b04781d14ee70ef1424a6f8e52ade40495cfe
commit ec5b04781d14ee70ef1424a6f8e52ade40495cfe
Merge: 9d7c77e 4ed758e
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 8 13:03:47 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 8 13:03:47 2012 -0400
Merge topic 'include-FPHSA' into next
4ed758e include FPHSA from current directory in all modules
d35f552 CMake Nightly Date Stamp
308564e CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ed758ec127b44c0877d414c7501538b7a6992f7
commit 4ed758ec127b44c0877d414c7501538b7a6992f7
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 8 19:03:26 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Sep 8 19:03:26 2012 +0200
include FPHSA from current directory in all modules
diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index bc0357e..aa2f582 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -76,7 +76,7 @@ endif ()
# Checks 'REQUIRED', 'QUIET' and versions.
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
find_package_handle_standard_args(Armadillo
REQUIRED_VARS ARMADILLO_LIBRARY ARMADILLO_INCLUDE_DIR
VERSION_VAR ARMADILLO_VERSION_STRING)
diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index c4774d9..f97ba65 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -54,12 +54,12 @@ if(GETTEXT_MSGMERGE_EXECUTABLE)
unset(gettext_version)
endif()
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext
REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE
VERSION_VAR GETTEXT_VERSION_STRING)
-include(CMakeParseArguments)
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments)
function(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name)
set(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}")
diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake
index f8ea18b..c1eeb03 100644
--- a/Modules/FindLibLZMA.cmake
+++ b/Modules/FindLibLZMA.cmake
@@ -53,7 +53,7 @@ if (LIBLZMA_LIBRARY)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET)
endif ()
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibLZMA REQUIRED_VARS LIBLZMA_INCLUDE_DIR
LIBLZMA_LIBRARY
LIBLZMA_HAS_AUTO_DECODER
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index b9440a8..3b42aba 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -146,7 +146,7 @@ if (PostgreSQL_INCLUDE_DIR AND EXISTS "${PostgreSQL_INCLUDE_DIR}/pg_config.h")
endif()
# Did we find anything?
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
find_package_handle_standard_args(PostgreSQL
REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
VERSION_VAR PostgreSQL_VERSION_STRING)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindArmadillo.cmake | 2 +-
Modules/FindGettext.cmake | 4 ++--
Modules/FindLibLZMA.cmake | 2 +-
Modules/FindPostgreSQL.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list