[Cmake-commits] CMake branch, master, updated. v3.11.2-844-g4e89080
Kitware Robot
kwrobot at kitware.com
Tue May 29 05:35:06 EDT 2018
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 4e890800eb79cfa758c27ae55eb5ffe10b19fcb3 (commit)
via 7b2f440e2b9c383cca3c5557e8dddd99cc8cab44 (commit)
via 79b29b732c0a779f664d08173f0875d000be4844 (commit)
from 11818c5fc1fa33fcac6b4961de56f02eb75f9c67 (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=4e890800eb79cfa758c27ae55eb5ffe10b19fcb3
commit 4e890800eb79cfa758c27ae55eb5ffe10b19fcb3
Merge: 11818c5 7b2f440
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue May 29 09:24:29 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 29 05:25:04 2018 -0400
Merge topic 'doxygen-all'
7b2f440e2b FindDoxygen: Add tests for ALL option
79b29b732c FindDoxygen: add optional ALL argument
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2099
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b2f440e2b9c383cca3c5557e8dddd99cc8cab44
commit 7b2f440e2b9c383cca3c5557e8dddd99cc8cab44
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun May 27 18:08:24 2018 +1000
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Sun May 27 18:18:40 2018 +1000
FindDoxygen: Add tests for ALL option
diff --git a/Tests/FindDoxygen/AllTarget/CMakeLists.txt b/Tests/FindDoxygen/AllTarget/CMakeLists.txt
new file mode 100644
index 0000000..69aa518
--- /dev/null
+++ b/Tests/FindDoxygen/AllTarget/CMakeLists.txt
@@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.10)
+project(TestFindDoxygen VERSION 1.0 LANGUAGES NONE)
+enable_testing()
+
+find_package(Doxygen REQUIRED)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/main.cpp [[
+/**
+ * \file
+ * \brief One C++ file w/ sample Doxygen comment just to produce any docs...
+ */
+]])
+
+set(DOXYGEN_OUTPUT_DIRECTORY outDirWithout)
+file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_OUTPUT_DIRECTORY})
+doxygen_add_docs(docsNoAll ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
+
+set(DOXYGEN_OUTPUT_DIRECTORY outDirWith)
+file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_OUTPUT_DIRECTORY})
+doxygen_add_docs(docsWithAll ALL ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
+
+# Define tests cases that check whether targets were built
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dirExists.cmake [[
+cmake_minimum_required(VERSION 3.11)
+if(NOT EXISTS ${dirName})
+ message(FATAL_ERROR "Directory does not exist: ${dirName}")
+endif()
+]])
+
+add_test(NAME checkWith COMMAND
+ ${CMAKE_COMMAND}
+ -D dirName=${CMAKE_CURRENT_BINARY_DIR}/outDirWith
+ -P dirExists.cmake
+)
+add_test(NAME checkWithout COMMAND
+ ${CMAKE_COMMAND}
+ -D dirName=${CMAKE_CURRENT_BINARY_DIR}/outDirWithout
+ -P dirExists.cmake
+)
+set_tests_properties(checkWithout PROPERTIES
+ WILL_FAIL TRUE
+)
diff --git a/Tests/FindDoxygen/CMakeLists.txt b/Tests/FindDoxygen/CMakeLists.txt
index 69b9eed..7ce98d5 100644
--- a/Tests/FindDoxygen/CMakeLists.txt
+++ b/Tests/FindDoxygen/CMakeLists.txt
@@ -18,6 +18,16 @@ add_test(NAME FindDoxygen.QuotingTest COMMAND
--build-options ${build_options}
)
+add_test(NAME FindDoxygen.AllTarget COMMAND
+ ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/FindDoxygen/AllTarget"
+ "${CMake_BINARY_DIR}/Tests/FindDoxygen/AllTarget"
+ ${build_generator_args}
+ --build-options ${build_options}
+ --test-command ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
+)
+
if(CMake_TEST_FindDoxygen_Dot)
add_test(NAME FindDoxygen.DotComponentTest COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79b29b732c0a779f664d08173f0875d000be4844
commit 79b29b732c0a779f664d08173f0875d000be4844
Author: David Demelier <markand at malikania.fr>
AuthorDate: Wed May 23 15:38:16 2018 +0200
Commit: David Demelier <markand at malikania.fr>
CommitDate: Thu May 24 15:13:35 2018 +0200
FindDoxygen: add optional ALL argument
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 599d799..945ee0e 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -69,6 +69,7 @@ Functions
doxygen_add_docs(targetName
[filesOrDirs...]
+ [ALL]
[WORKING_DIRECTORY dir]
[COMMENT comment])
@@ -91,6 +92,8 @@ Functions
the :command:`add_custom_target` command used to create the custom target
internally.
+ If ALL is set, the target will be added to the default build target.
+
The contents of the generated ``Doxyfile`` can be customized by setting CMake
variables before calling ``doxygen_add_docs()``. Any variable with a name of
the form ``DOXYGEN_<tag>`` will have its value substituted for the
@@ -788,7 +791,7 @@ function(doxygen_list_to_quoted_strings LIST_VARIABLE)
endfunction()
function(doxygen_add_docs targetName)
- set(_options)
+ set(_options ALL)
set(_one_value_args WORKING_DIRECTORY COMMENT)
set(_multi_value_args)
cmake_parse_arguments(_args
@@ -1089,8 +1092,13 @@ doxygen_add_docs() for target ${targetName}")
set(_target_doxyfile "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.${targetName}")
configure_file("${_doxyfile_template}" "${_target_doxyfile}")
+ unset(_all)
+ if(${_args_ALL})
+ set(_all ALL)
+ endif()
+
# Add the target
- add_custom_target( ${targetName} VERBATIM
+ add_custom_target( ${targetName} ${_all} VERBATIM
COMMAND ${CMAKE_COMMAND} -E make_directory ${_original_doxygen_output_dir}
COMMAND "${DOXYGEN_EXECUTABLE}" "${_target_doxyfile}"
WORKING_DIRECTORY "${_args_WORKING_DIRECTORY}"
-----------------------------------------------------------------------
Summary of changes:
Modules/FindDoxygen.cmake | 12 ++++++--
Tests/FindDoxygen/AllTarget/CMakeLists.txt | 42 ++++++++++++++++++++++++++++
Tests/FindDoxygen/CMakeLists.txt | 10 +++++++
3 files changed, 62 insertions(+), 2 deletions(-)
create mode 100644 Tests/FindDoxygen/AllTarget/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list