mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 00:29:00 +08:00
30 lines
984 B
Diff
30 lines
984 B
Diff
|
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
|
||
|
|
index 7bd00d3..d903584 100644
|
||
|
|
--- a/build/cmake/init.cmake
|
||
|
|
+++ b/build/cmake/init.cmake
|
||
|
|
@@ -493,7 +493,9 @@ if(wxUSE_GUI)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE)
|
||
|
|
- find_package(SDL2)
|
||
|
|
+ find_package(SDL2 CONFIG REQUIRED)
|
||
|
|
+ set(SDL2_INCLUDE_DIR "" CACHE INTERNAL "")
|
||
|
|
+ set(SDL2_LIBRARY SDL2::SDL2 CACHE INTERNAL "")
|
||
|
|
if(NOT SDL2_FOUND)
|
||
|
|
find_package(SDL)
|
||
|
|
endif()
|
||
|
|
diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in
|
||
|
|
index 248a701..f617dc4 100644
|
||
|
|
--- a/build/cmake/wxWidgetsConfig.cmake.in
|
||
|
|
+++ b/build/cmake/wxWidgetsConfig.cmake.in
|
||
|
|
@@ -2,6 +2,9 @@
|
||
|
|
|
||
|
|
include(CMakeFindDependencyMacro)
|
||
|
|
find_dependency(unofficial-nanosvg CONFIG)
|
||
|
|
+if("@wxUSE_LIBSDL@")
|
||
|
|
+ find_dependency(SDL2 CONFIG)
|
||
|
|
+endif()
|
||
|
|
|
||
|
|
# determine target from compiler, platform and library type
|
||
|
|
if(WIN32 AND NOT CYGWIN AND NOT MSYS)
|