diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-01 11:36:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-01 11:36:50 (GMT) |
| commit | 8cf2e1de225946201ad6d052ca004b8105d17aba (patch) | |
| tree | 5a83539d3eb50d874e614eb07ca9dd2a8f82df1e | |
| parent | 14e25d991b2e44bf64306fa149a4ac915c4d71be (diff) | |
| parent | 6fc4bfa11cf2c1de1c6c44704cd7c160f4363ea8 (diff) | |
| download | CMake-8cf2e1de225946201ad6d052ca004b8105d17aba.zip CMake-8cf2e1de225946201ad6d052ca004b8105d17aba.tar.gz CMake-8cf2e1de225946201ad6d052ca004b8105d17aba.tar.bz2 | |
Merge topic 'ninja-multi-export-all-symbols'
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 f2a51ab..802b613 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2651,7 +2651,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 a32f551..3f4ecbe 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) |