mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-11 20:41:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
47237ed73e
vcpkg/ports/osg/fix-nvtt-squish.patch

23 lines
598 B
Diff
Raw Normal View History

[osg] Cleanup, export unofficial config (#24720) * 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
2022-06-21 04:49:37 +08:00
diff --git a/CMakeModules/FindNVTT.cmake b/CMakeModules/FindNVTT.cmake
index d0e7414..f6fb761 100644
--- a/CMakeModules/FindNVTT.cmake
+++ b/CMakeModules/FindNVTT.cmake
@@ -120,7 +120,7 @@ FIND_LIBRARY(NVTHREAD_LIBRARY_DEBUG
# SQUISH
FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE
- NAMES squish
+ NAMES nvsquish NAMES_PER_DIR
PATHS
/usr/local
/usr
@@ -129,7 +129,7 @@ FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE
PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
)
FIND_LIBRARY(NVSQUISH_LIBRARY_DEBUG
- NAMES squish_d
+ NAMES nvsquish_d NAMES_PER_DIR
PATHS
/usr/local
/usr
Reference in New Issue Copy Permalink