23 lines
814 B
Diff
23 lines
814 B
Diff
Find wxWidgets components (bug 122412)
|
|
Fix compatibility with cmake-3.15. wxWidgets_USE_LIBS is deprecated.
|
|
|
|
Link:
|
|
Subject: find wxWidgets components
|
|
Bug: 122412
|
|
Tags: common
|
|
|
|
diff -rupN a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2020-03-10 22:09:23.815101665 +0300
|
|
+++ b/CMakeLists.txt 2020-03-10 22:10:57.112424104 +0300
|
|
@@ -162,8 +162,8 @@ ENDIF(WIN32)
|
|
##
|
|
# This must come before FINDs for tiff, jpeg, png, zlib to enable
|
|
# finding the wxWidgets distributions of those packages (Win32 only).
|
|
-SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa)
|
|
-FIND_PACKAGE(wxWidgets REQUIRED)
|
|
+SET(wxWidgets_FIND_COMPONENTS base core aui xrc html xml adv gl net qa)
|
|
+FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
|
|
|
|
# hugin requires wxwidgets 3.0 or above
|
|
IF (UNIX)
|