summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-12-10 14:28:50 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-12-10 14:29:01 (GMT)
commitdb127457e3f9020ba46b420d75d27cfff128fca2 (patch)
tree39c04c57710aaf3c19519edf3315b6b2c150ab9b
parentb2ce834480750647e641bdfba50fc1999bbfd76c (diff)
parentada1824dc513b89a44aea5a8db955652ff7ce8f2 (diff)
downloadCMake-db127457e3f9020ba46b420d75d27cfff128fca2.zip
CMake-db127457e3f9020ba46b420d75d27cfff128fca2.tar.gz
CMake-db127457e3f9020ba46b420d75d27cfff128fca2.tar.bz2
Merge topic 'wxwidgets_macos_weakframework' into release-3.16
ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
-rw-r--r--Modules/FindwxWidgets.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 4334e22..93ac51d 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -852,6 +852,8 @@ else()
separate_arguments(wxWidgets_LIBRARIES)
string(REPLACE "-framework;" "-framework "
wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+ string(REPLACE "-weak_framework;" "-weak_framework "
+ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
string(REPLACE "-arch;" "-arch "
wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
string(REPLACE "-isysroot;" "-isysroot "