summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-30 14:33:35 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-30 15:28:05 (GMT)
commiteff9c69740d5d4a26025a89f517a612e446077c0 (patch)
tree48be3ccd8bc8cf8ca2be984dca3f16ff7dfb877c /Source/cmGlobalXCodeGenerator.h
parent748d024551d8f447046363ad617fc72bdd977fd2 (diff)
downloadCMake-eff9c69740d5d4a26025a89f517a612e446077c0.zip
CMake-eff9c69740d5d4a26025a89f517a612e446077c0.tar.gz
CMake-eff9c69740d5d4a26025a89f517a612e446077c0.tar.bz2
Xcode: Place object library artifacts outside Objects-normal directory
The `CONFIGURATION_BUILD_DIR` value in the Xcode project file specifies where to place the library artifact. For object libraries we've used the `Objects-normal` directory to hide away the `.a` that we otherwise cannot stop Xcode from producing. The parent of this directory is also specific to the target and does not vary with Xcode's sanitizer features, so move the artifact there. Issue: #16289
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
-rw-r--r--Source/cmGlobalXCodeGenerator.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 92ff258..e1e412d 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -264,9 +264,10 @@ private:
{
}
- std::string GetObjectsNormalDirectory(const std::string& projName,
- const std::string& configName,
- const cmGeneratorTarget* t) const;
+ std::string GetObjectsDirectory(const std::string& projName,
+ const std::string& configName,
+ const cmGeneratorTarget* t,
+ const std::string& variant) const;
static std::string GetDeploymentPlatform(const cmMakefile* mf);