[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-883-gc2786ef
Brad King
brad.king at kitware.com
Tue Jul 7 09:39:47 EDT 2015
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 c2786ef980d5f42dd5ab2cdfcba2bf7bef7e54f2 (commit)
via 9ce7a663d6d50c6f2d7a3fbc76ed10c5af6a91a5 (commit)
from 5c0b4377a23bf3abf11ad23cbac6f542ad09195e (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=c2786ef980d5f42dd5ab2cdfcba2bf7bef7e54f2
commit c2786ef980d5f42dd5ab2cdfcba2bf7bef7e54f2
Merge: 5c0b437 9ce7a66
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 7 09:39:46 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 7 09:39:46 2015 -0400
Merge topic 'cmake-install-components' into next
9ce7a663 Utilities/Sphinx: Add CMake_OPTIONAL_COMPONENT macro
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce7a663d6d50c6f2d7a3fbc76ed10c5af6a91a5
commit 9ce7a663d6d50c6f2d7a3fbc76ed10c5af6a91a5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 7 09:38:48 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 7 09:38:48 2015 -0400
Utilities/Sphinx: Add CMake_OPTIONAL_COMPONENT macro
When building this directory independently define the macro since we
will not get the definition from the top level of the source tree.
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 77a1255..1baca35 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -19,6 +19,9 @@ if(NOT CMake_SOURCE_DIR)
include(${CMake_SOURCE_DIR}/Source/CMakeInstallDestinations.cmake)
unset(CMAKE_DATA_DIR)
unset(CMAKE_DATA_DIR CACHE)
+ macro(CMake_OPTIONAL_COMPONENT)
+ set(COMPONENT "")
+ endmacro()
endif()
project(CMakeHelp NONE)
-----------------------------------------------------------------------
Summary of changes:
Utilities/Sphinx/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list