[Cmake-commits] CMake branch, next, updated. v2.8.9-420-gfe24f1f
Rolf Eike Beer
eike at sf-mail.de
Sat Sep 8 14:26:29 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 fe24f1f961d2449ddfaef1208b67b03e124f52b6 (commit)
via fbcc90b0a006e5954c4f9145be230de5d2873dc4 (commit)
from 0550c387ed25147c9abc58efece72e2a6726a0d5 (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=fe24f1f961d2449ddfaef1208b67b03e124f52b6
commit fe24f1f961d2449ddfaef1208b67b03e124f52b6
Merge: 0550c38 fbcc90b
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 8 14:26:27 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 8 14:26:27 2012 -0400
Merge topic 'include-FPHSA' into next
fbcc90b fix include module names
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbcc90b0a006e5954c4f9145be230de5d2873dc4
commit fbcc90b0a006e5954c4f9145be230de5d2873dc4
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 8 20:26:09 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Sep 8 20:26:09 2012 +0200
fix include module names
diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index aa2f582..4758534 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -76,7 +76,7 @@ endif ()
# Checks 'REQUIRED', 'QUIET' and versions.
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
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 f97ba65..cdb02cf 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -54,12 +54,12 @@ if(GETTEXT_MSGMERGE_EXECUTABLE)
unset(gettext_version)
endif()
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext
REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE
VERSION_VAR GETTEXT_VERSION_STRING)
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments)
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
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 c1eeb03..837e633 100644
--- a/Modules/FindLibLZMA.cmake
+++ b/Modules/FindLibLZMA.cmake
@@ -47,13 +47,13 @@ endif()
# it can be found in http://tukaani.org/xz/
# Avoid using old codebase
if (LIBLZMA_LIBRARY)
- include(CheckLibraryExists)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET)
endif ()
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
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 3b42aba..6a1d349 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(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
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 | 4 ++--
Modules/FindPostgreSQL.cmake | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list