[Cmake-commits] CMake branch, master, updated. v2.8.9-131-gc79dd4d

[David Cole]

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, master has been updated
       via  c79dd4d951eec397692dd4af18e6a85b25a4f4ef (commit)
       via  4be6783711b2ff510c3449c5de22d35663d8bfc1 (commit)
      from  19e210af90d943548e7f07759030a2dd2cc8a2a4 (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=c79dd4d951eec397692dd4af18e6a85b25a4f4ef
commit c79dd4d951eec397692dd4af18e6a85b25a4f4ef
Merge: 19e210a 4be6783
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Aug 20 15:42:34 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 20 15:42:34 2012 -0400

    Merge topic 'read-less-from-version-headers'
    
    4be6783 read less from version headers into variables

diff --cc Modules/FindArmadillo.cmake
index ebbdb0a,0bd3e6c..bc0357e
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@@ -64,8 -64,9 +64,9 @@@ if(ARMADILLO_INCLUDE_DIR
      string(REGEX REPLACE ".*#define ARMA_VERSION_PATCH ([0-9]+).*" "\\1" ARMADILLO_VERSION_PATCH "${_armadillo_HEADER_CONTENTS}")
  
      # WARNING: The number of spaces before the version name is not one.
 -    string(REGEX REPLACE ".*#define ARMA_VERSION_NAME\ +\"([0-9a-zA-Z\ _-]+)\".*" "\\1" ARMADILLO_VERSION_NAME "${_armadillo_HEADER_CONTENTS}")
 +    string(REGEX REPLACE ".*#define ARMA_VERSION_NAME +\"([0-9a-zA-Z _-]+)\".*" "\\1" ARMADILLO_VERSION_NAME "${_armadillo_HEADER_CONTENTS}")
  
+     unset(_armadillo_HEADER_CONTENTS)
    endif()
  
    set(ARMADILLO_VERSION_STRING "${ARMADILLO_VERSION_MAJOR}.${ARMADILLO_VERSION_MINOR}.${ARMADILLO_VERSION_PATCH}")

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

Summary of changes:
 Modules/FindArmadillo.cmake      |    3 ++-
 Modules/FindBoost.cmake          |    3 ++-
 Modules/FindGTK2.cmake           |    2 +-
 Modules/FindHSPELL.cmake         |    3 ++-
 Modules/FindLibLZMA.cmake        |    3 ++-
 Modules/FindOpenSceneGraph.cmake |    4 +++-
 Modules/FindQt3.cmake            |    4 ++--
 Modules/KDE3Macros.cmake         |   35 +++++++++++++++++------------------
 Modules/Qt4Macros.cmake          |    8 ++++----
 9 files changed, 35 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake