summaryrefslogtreecommitdiffstats
path: root/Tests/SubProject/bar.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-12 14:36:10 (GMT)
committerBrad King <brad.king@kitware.com>2014-06-12 15:14:06 (GMT)
commit790e167718bff5660e9023f627df0413504fb207 (patch)
tree77b8523cd5123ba95064aa3448a74adb00846234 /Tests/SubProject/bar.cxx
parent5fba44cf41312a64b1cc661d4015ba16ac9f2af8 (diff)
downloadCMake-790e167718bff5660e9023f627df0413504fb207.zip
CMake-790e167718bff5660e9023f627df0413504fb207.tar.gz
CMake-790e167718bff5660e9023f627df0413504fb207.tar.bz2
VS: Fix subproject .sln dependencies on custom targets
Each project listed in a .sln must be marked (or not) as part of the "default build" for each configuration. For targets created by the add_custom_target() command we add them to the default build if they are not excluded in some way or if another target depends on them. In the top-level .sln, a custom target is excluded if it is not created with the ALL option to add_custom_target. In subdirectory .sln files, a target may also be excluded if it is not within the directory and is brought into the solution only due to a dependency from another target in the solution. Fix the "IsPartOfDefaultBuild" and "IsDependedOn" methods to check every target to be included in the .sln for a dependency on the custom target. Otherwise transitive dependencies through targets not in the current subdirectory will not be considered. Extend the SubProject test with a custom target to cover this case. Reported-by: William Deurwaarder <William.Deurwaarder@tomtom.com> Reported-by: Dirk Steenpass <dirk.steenpass@gmail.com>
Diffstat (limited to 'Tests/SubProject/bar.cxx')
-rw-r--r--Tests/SubProject/bar.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/Tests/SubProject/bar.cxx b/Tests/SubProject/bar.cxx
index c3f6a18..c8b8743 100644
--- a/Tests/SubProject/bar.cxx
+++ b/Tests/SubProject/bar.cxx
@@ -1,4 +1 @@
-int bar()
-{
- return 10;
-}
+#include "gen.cxx"