[Cmake-commits] CMake branch, next, updated. v2.8.12-4846-gcd64cb0

[Brad King]

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  cd64cb070608961ca65e4fb72ccdc33a7e14ce3b (commit)
       via  a06debcde91866c005e88cb9d805a3351859aeef (commit)
      from  f603d527cc244247ede1256b5d43bb9432627b7d (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=cd64cb070608961ca65e4fb72ccdc33a7e14ce3b
commit cd64cb070608961ca65e4fb72ccdc33a7e14ce3b
Merge: f603d52 a06debc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 08:52:29 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 08:52:29 2013 -0500

    Merge topic 'FindPHP4-no-cache-output' into next
    
    a06debc FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a06debcde91866c005e88cb9d805a3351859aeef
commit a06debcde91866c005e88cb9d805a3351859aeef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 08:51:46 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 08:51:46 2013 -0500

    FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)
    
    The set() call for this variable left out the CACHE keyword.  It does
    not need to be cached anyway, so drop the other CACHE set() signature
    arguments.
    
    Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475
    Reported-by: Modestas Vainius <modax at debian.org>
    Inspired-by: Mathieu Malaterre <malat at debian.org>

diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake
index 51a89f3..25fff8c 100644
--- a/Modules/FindPHP4.cmake
+++ b/Modules/FindPHP4.cmake
@@ -46,7 +46,7 @@ if(PHP4_FOUND_INCLUDE_PATH)
   foreach(php4_path Zend main TSRM)
     set(php4_paths ${php4_paths} "${PHP4_FOUND_INCLUDE_PATH}/${php4_path}")
   endforeach()
-  set(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths")
+  set(PHP4_INCLUDE_PATH "${php4_paths}")
 endif()
 
 find_program(PHP4_EXECUTABLE NAMES php4 php )

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

Summary of changes:
 Modules/FindPHP4.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake