mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 05:11:48 +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
17 lines
729 B
Diff
17 lines
729 B
Diff
diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake
|
|
index 7dd0998..730af85 100644
|
|
--- a/CMakeModules/OsgEarthMacroUtils.cmake
|
|
+++ b/CMakeModules/OsgEarthMacroUtils.cmake
|
|
@@ -92,6 +92,11 @@ ENDMACRO(DETECT_OSG_VERSION)
|
|
|
|
MACRO(LINK_WITH_VARIABLES TRGTNAME)
|
|
FOREACH(varname ${ARGN})
|
|
+ string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}")
|
|
+ if(DEFINED ${lwv_libraries})
|
|
+ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}})
|
|
+ continue()
|
|
+ endif()
|
|
IF(${varname}_DEBUG)
|
|
IF(${varname}_RELEASE)
|
|
TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}")
|