[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-200-gbcca01d

[Kitware Robot]

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  bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 (commit)
       via  97a9a35607e653ebd5184facc191125e03173ca4 (commit)
      from  db96ebaa7bc5366aa5790307b682aa8548c2bba2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcca01d8adea0441fde4bd3f243ce43b70bb9cf6
commit bcca01d8adea0441fde4bd3f243ce43b70bb9cf6
Merge: db96eba 97a9a35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 30 14:17:11 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 30 10:17:29 2017 -0400

    Merge topic 'FindDoxygen-project-in-subdir'
    
    97a9a356 FindDoxygen: Use a stable reference to the location of global resources
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1014


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97a9a35607e653ebd5184facc191125e03173ca4
commit 97a9a35607e653ebd5184facc191125e03173ca4
Author:     Robert Dailey <rcdailey at gmail.com>
AuthorDate: Wed Jun 28 16:02:57 2017 -0500
Commit:     Robert Dailey <rcdailey at gmail.com>
CommitDate: Thu Jun 29 13:39:26 2017 -0500

    FindDoxygen: Use a stable reference to the location of global resources
    
    FindDoxygen generates some files based on the version of Doxygen whose
    content will not vary across a project and are therefore a global
    resource that can be shared by all calls to `find_package(Doxygen)` and
    to `doxygen_add_docs`.  We currently use `${PROJECT_BINARY_DIR}` to
    reference their location, but this is not stable because `project()`
    calls in a subdirectory can change it.  Use `${CMAKE_BINARY_DIR}`
    instead.
    
    Reviewed-by: Craig Scott <craig.scott at crascit.com>
    Fixes: #17022

diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 26d44b9..fb16f20 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -619,7 +619,7 @@ if(TARGET Doxygen::doxygen)
     # If doxygen was found, use it to generate a minimal default Doxyfile.
     # We will delete this file after we have finished using it below to
     # generate the other files that doxygen_add_docs() will use.
-    set(_Doxygen_tpl "${PROJECT_BINARY_DIR}/CMakeDoxyfile.tpl")
+    set(_Doxygen_tpl "${CMAKE_BINARY_DIR}/CMakeDoxyfile.tpl")
     execute_process(
         COMMAND "${DOXYGEN_EXECUTABLE}" -s -g "${_Doxygen_tpl}"
         OUTPUT_QUIET
@@ -646,8 +646,8 @@ if(TARGET Doxygen::doxygen)
     # content is only dependent on the version of Doxygen being used. Therefore
     # we always put them at the top of the build tree so that they are in a
     # predictable location.
-    set(_doxyfile_in       "${PROJECT_BINARY_DIR}/CMakeDoxyfile.in")
-    set(_doxyfile_defaults "${PROJECT_BINARY_DIR}/CMakeDoxygenDefaults.cmake")
+    set(_doxyfile_in       "${CMAKE_BINARY_DIR}/CMakeDoxyfile.in")
+    set(_doxyfile_defaults "${CMAKE_BINARY_DIR}/CMakeDoxygenDefaults.cmake")
 
     file(WRITE "${_doxyfile_in}"       ${_Doxygen_dne_header})
     file(WRITE "${_doxyfile_defaults}" ${_Doxygen_dne_header})
@@ -896,7 +896,7 @@ doxygen_add_docs() for target ${targetName}")
 
     # Now bring in Doxgen's defaults for those things the project has not
     # already set and we have not provided above
-    include("${PROJECT_BINARY_DIR}/CMakeDoxygenDefaults.cmake" OPTIONAL)
+    include("${CMAKE_BINARY_DIR}/CMakeDoxygenDefaults.cmake" OPTIONAL)
 
     # Cleanup built HTMLs on "make clean"
     # TODO Any other dirs?
@@ -1025,7 +1025,7 @@ doxygen_add_docs() for target ${targetName}")
     endforeach()
 
     # Prepare doxygen configuration file
-    set(_doxyfile_template "${PROJECT_BINARY_DIR}/CMakeDoxyfile.in")
+    set(_doxyfile_template "${CMAKE_BINARY_DIR}/CMakeDoxyfile.in")
     set(_target_doxyfile "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.${targetName}")
     configure_file("${_doxyfile_template}" "${_target_doxyfile}")
 

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

Summary of changes:
 Modules/FindDoxygen.cmake |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake