summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-21 15:23:53 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-10-21 15:24:28 (GMT)
commit667f2861dcfc153caf7ae610a61b6b6bbc3445f0 (patch)
tree0b651496bf84cb03b51550bc51ada16c0911cc95 /Source
parent53f95dc5fb161ed92fb9fcb8ecc31502c5e6417e (diff)
parentf7acc1266c64be58793cf926b41f0d58b5a55e2a (diff)
downloadCMake-667f2861dcfc153caf7ae610a61b6b6bbc3445f0.zip
CMake-667f2861dcfc153caf7ae610a61b6b6bbc3445f0.tar.gz
CMake-667f2861dcfc153caf7ae610a61b6b6bbc3445f0.tar.bz2
Merge topic 'project-include-before'
f7acc1266c project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3936
Diffstat (limited to 'Source')
-rw-r--r--Source/cmProjectCommand.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index eb59b4f..1ce6c70 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -39,6 +39,11 @@ bool cmProjectCommand(std::vector<std::string> const& args,
std::string const& projectName = args[0];
+ if (!IncludeByVariable(status,
+ "CMAKE_PROJECT_" + projectName + "_INCLUDE_BEFORE")) {
+ return false;
+ }
+
mf.SetProjectName(projectName);
mf.AddCacheDefinition(projectName + "_BINARY_DIR",