[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3841-gba97ed1

Rolf Eike Beer eike at sf-mail.de
Sat Aug 10 16:01:21 EDT 2013


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  ba97ed13f40d82b8bbd3819772982285c2706069 (commit)
       via  a7f3675de84ed76a21602c0abc1fa77ec276372a (commit)
      from  74436a6c3da9c19019bfc170299f62fd6da827b9 (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=ba97ed13f40d82b8bbd3819772982285c2706069
commit ba97ed13f40d82b8bbd3819772982285c2706069
Merge: 74436a6 a7f3675
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 10 16:01:19 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 10 16:01:19 2013 -0400

    Merge topic 'cxx-flags' into next
    
    a7f3675 remove inclusion from current dir, doesn't work for included files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7f3675de84ed76a21602c0abc1fa77ec276372a
commit a7f3675de84ed76a21602c0abc1fa77ec276372a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 10 22:00:30 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Aug 10 22:01:00 2013 +0200

    remove inclusion from current dir, doesn't work for included files

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 842e824..d8cc2d3 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -22,7 +22,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake)
+include(CheckCSourceCompiles)
 
 macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
    set(${_VAR}
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index 5e221e6..f1b07bc 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -22,12 +22,12 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-include(${CMAKE_CURRENT_LIST_DIR}/CheckCXXSourceCompiles.cmake)
+include(CheckCXXSourceCompiles)
 
 # This is a function to have the include in a scope to force people to
 # explicitely include CheckCCompilerFlag if they need it.
 function (CHECK_CXX_COMPILER_FLAG_COMMON_PATTERNS _VAR)
-   include(${CMAKE_CURRENT_LIST_DIR}/CheckCCompilerFlag.cmake)
+   include(CheckCCompilerFlag)
    CHECK_COMPILER_FLAG_COMMON_PATTERNS(${_VAR})
    set(${_VAR} ${${_VAR}} PARENT_SCOPE)
 endfunction ()

-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckCCompilerFlag.cmake   |    2 +-
 Modules/CheckCXXCompilerFlag.cmake |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list