diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-01 11:36:42 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-01 07:36:49 -0400 |
| commit | 70b8a2863f59ef36b2c10ccd616e119ae5522fe5 (patch) | |
| tree | 31462539384a7d93652e7adb071b25f3111bcbc8 | |
| parent | 1e4aaa31dd619dd2685f51489e66f6d9d8a8fe9c (diff) | |
| parent | 6fc4bfa11cf2c1de1c6c44704cd7c160f4363ea8 (diff) | |
| download | cmake-70b8a2863f59ef36b2c10ccd616e119ae5522fe5.tar.gz | |
Merge topic 'ninja-multi-export-all-symbols' into release-3.17
6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !4825
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/Simple.cmake | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 5828651cd4..b4b0c45bbc 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2529,7 +2529,8 @@ void cmGeneratorTarget::ComputeModuleDefinitionInfo( info.DefFileGenerated = false; #endif if (info.DefFileGenerated) { - info.DefFile = this->ObjectDirectory /* has slash */ + "exports.def"; + info.DefFile = + this->GetObjectDirectory(config) /* has slash */ + "exports.def"; } else if (!info.Sources.empty()) { info.DefFile = info.Sources.front()->GetFullPath(); } diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple.cmake index a32f551109..3f4ecbed24 100644 --- a/Tests/RunCMake/NinjaMultiConfig/Simple.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/Simple.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + file(TOUCH ${CMAKE_BINARY_DIR}/empty.cmake) include(${CMAKE_BINARY_DIR}/empty.cmake) |