mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 15:58:59 +08:00
0d27810d17
* Revise portfile * Plugins are a default feature; fix disabling * Remove line continuations from pc file vcpkg_fixup_pkgconfig cannot handle it. * Control nvtt plugin via feature * Control dae plugin, not find_package * Control fontconfig via feature Use CMake's (3.14) find module for which vcpkg provides a wrapper. OSG links to Fontconfig::Fontconfig. OSG default is to use Fontconfig except for ios and android. * Control freetype via feature Use CMake's find module for which vcpkg provides a wrapper. OSG links to FREETYPE_LIBRARIES. * Control RestHttpDevice via feature Only this plugin needs boost. * Drop unused liblas dependency * Drop unused coin dependency Coin was meant to be used for the inventor plugin, but this plugin is disabled. * Control sdl1 via feature * Enable apps on linux * Disable apps and docs for debug * Drop example application patch * Use option, not patch, to disable DLL versioning * Fix osg plugin PDB installation * Prefer <Pkg>_LIBRARIES for linking <Pkg>_LIBRARIES carries debug+release config and transitive usage requirements. * Curl patches are obsolete now. We leverage CURL_LIBRARIES via link-libraries.patch. * Add unofficial config export * Use toolchain's windows version Fixes mingw build. * Avoid extra dependency lookups * Silence warnings about plugin control variables * Define OSG_LIBRARY_STATIC * Revise copying of plugins * Control OpenEXR via feature Unblock uwp. * Allow jasper without opengl * [osgearth] Remove obsolete geos patching The build uses exported geos config. * [osgearth] Serialize linking to avoid OOM errors * [osgearth] Fix minor portfile issues * [osgearth] Prefer <Pkg>_LIBRARIES for linking <Pkg>_LIBRARIES carries debug+release config and transitive usage requirements. * [osgearth] Use unofficial osg config * [osgearth] Fix lib installation dir * [osgearth] Revise OSGEARTH_LIBRARY_STATIC * [osgearth] Revise find_package patching * [osgearth] Revise copying of plugins * [osgearth] Disable tools for debug variant * [osgearth] Control Blend2D via feature * Update versions * Fix plugin lookup * Update versions * CR request * Update versions * [osgearth] Remove tools from default features * Update versions
28 lines
837 B
Diff
28 lines
837 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 81328ea..c735419 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -755,7 +755,8 @@ ELSE()
|
|
FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
|
|
FIND_PACKAGE(GLIB COMPONENTS gobject)
|
|
FIND_PACKAGE(DirectShow)
|
|
- FIND_PACKAGE(SDL2)
|
|
+ find_package(SDL2 CONFIG)
|
|
+ set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main)
|
|
FIND_PACKAGE(SDL)
|
|
FIND_PACKAGE(Poppler-glib)
|
|
FIND_PACKAGE(RSVG)
|
|
diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp
|
|
index 9de15b1..ae96e11 100644
|
|
--- a/examples/osgmovie/osgmovie.cpp
|
|
+++ b/examples/osgmovie/osgmovie.cpp
|
|
@@ -691,7 +691,7 @@ int main(int argc, char** argv)
|
|
|
|
#if USE_SDL || USE_SDL2
|
|
|
|
-#include "SDL.h"
|
|
+#include <SDL/SDL.h>
|
|
|
|
static void soundReadCallback(void * user_data, uint8_t * data, int datalen)
|
|
{
|