[Cmake-commits] CMake branch, next, updated. v2.8.5-1743-gbe72c04

[Stephen Kelly]

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  be72c0419a457a8519d86c6cab4a4bd2651f6e2d (commit)
       via  6a6393c905bd5bdddfaf0eb666ee479eed54ec28 (commit)
      from  56a66a783ea6f49553869884af2f458d28db2b07 (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=be72c0419a457a8519d86c6cab4a4bd2651f6e2d
commit be72c0419a457a8519d86c6cab4a4bd2651f6e2d
Merge: 56a66a7 6a6393c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 27 03:45:40 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 27 03:45:40 2011 -0400

    Merge topic 'generate_export_header' into next
    
    6a6393c Don't use a variable name that might be used in other files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a6393c905bd5bdddfaf0eb666ee479eed54ec28
commit 6a6393c905bd5bdddfaf0eb666ee479eed54ec28
Author:     David Faure <faure at kde.org>
AuthorDate: Sat Aug 27 09:42:26 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 27 09:44:52 2011 +0200

    Don't use a variable name that might be used in other files.
    
    myDir is also used in the Grantlee config file, so if Grantlee
    was found, this call failed.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 0f5c413..4eb67b5 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -215,7 +215,7 @@ macro(_test_compiler_has_deprecated)
   endif()
 endmacro()
 
-set(myDir "${CMAKE_CURRENT_LIST_DIR}")
+get_filename_component(_GENERATE_EXPORT_HEADER_MODULE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
 macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
   set(DEFINE_DEPRECATED)
@@ -308,7 +308,7 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
     set(EXPORT_IMPORT_CONDITION ${TARGET_LIBRARY}_EXPORTS)
   endif()
 
-  configure_file("${myDir}/exportheader.cmake.in" "${EXPORT_FILE_NAME}" @ONLY)
+  configure_file("${_GENERATE_EXPORT_HEADER_MODULE_DIR}/exportheader.cmake.in" "${EXPORT_FILE_NAME}" @ONLY)
 endmacro()
 
 function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
@@ -343,4 +343,4 @@ function(add_compiler_export_flags)
     set (EXTRA_FLAGS "${EXTRA_FLAGS} -fvisibility-inlines-hidden")
   endif()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}" PARENT_SCOPE)
-endfunction()
\ No newline at end of file
+endfunction()

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

Summary of changes:
 Modules/GenerateExportHeader.cmake |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake