diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-04 15:30:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-04 15:30:38 (GMT) |
| commit | abc78a35578de4260f497ecd924ca3323fb17604 (patch) | |
| tree | c4342a051c4a04de4a12e22ba7a0315a6e4fc859 | |
| parent | b78d312de63d2bdd889739379e613baa043ef32b (diff) | |
| parent | e8f0b75ff9dc564513f01c7b814f06adb6809b82 (diff) | |
| download | CMake-abc78a35578de4260f497ecd924ca3323fb17604.zip CMake-abc78a35578de4260f497ecd924ca3323fb17604.tar.gz CMake-abc78a35578de4260f497ecd924ca3323fb17604.tar.bz2 | |
Merge topic 'mingw-archive-no-replace'
e8f0b75ff9 Windows-GNU: Support duplicate object names when linking shared libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6081
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index e50c215..d000380 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -121,7 +121,7 @@ macro(__windows_compiler_gnu lang) CMAKE_${lang}_${rule} "${CMAKE_${lang}_${rule}}") set(CMAKE_${lang}_${rule} "<CMAKE_COMMAND> -E rm -f <OBJECT_DIR>/objects.a" - "<CMAKE_AR> cr <OBJECT_DIR>/objects.a <OBJECTS>" + "<CMAKE_AR> qc <OBJECT_DIR>/objects.a <OBJECTS>" "${CMAKE_${lang}_${rule}}" ) endforeach() |