mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 04:49:01 +08:00
68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 001ebf1..8e49af2 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -128,24 +128,45 @@ ENDIF (OSGEARTH_USE_GLES)
|
||
|
|
|
||
|
|
# required
|
||
|
|
find_package(OSG REQUIRED)
|
||
|
|
-find_package(CURL REQUIRED)
|
||
|
|
+find_package(CURL CONFIG REQUIRED)
|
||
|
|
+set(CURL_LIBRARY CURL::libcurl)
|
||
|
|
+
|
||
|
|
find_package(GDAL REQUIRED)
|
||
|
|
+set(GDAL_LIBRARY ${GDAL_LIBRARIES})
|
||
|
|
+set(GDAL_FOUND 1)
|
||
|
|
|
||
|
|
# optional
|
||
|
|
-find_package(GEOS REQUIRED)
|
||
|
|
-find_package(Sqlite3 REQUIRED)
|
||
|
|
+find_package(geos CONFIG REQUIRED)
|
||
|
|
+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c)
|
||
|
|
+set(GEOS_FOUND 1)
|
||
|
|
+
|
||
|
|
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
|
||
|
|
+set(SQLITE3_FOUND 1)
|
||
|
|
+set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3)
|
||
|
|
+
|
||
|
|
find_package(Draco REQUIRED)
|
||
|
|
find_package(BASISU REQUIRED)
|
||
|
|
+
|
||
|
|
find_package(GLEW REQUIRED)
|
||
|
|
-find_package(Protobuf REQUIRED)
|
||
|
|
-find_package(WEBP REQUIRED)
|
||
|
|
+set(GLEW_LIBRARIES GLEW::GLEW)
|
||
|
|
+set(GLEW_FOUND 1)
|
||
|
|
+
|
||
|
|
+find_package(protobuf CONFIG REQUIRED)
|
||
|
|
+set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf)
|
||
|
|
+set(Protobuf_FOUND 1)
|
||
|
|
+
|
||
|
|
+find_package(WebP CONFIG REQUIRED)
|
||
|
|
+set(WEBP_LIBRARY WebP::webp)
|
||
|
|
+set(WEBP_FOUND 1)
|
||
|
|
|
||
|
|
if(OSGEARTH_ENABLE_PROFILING)
|
||
|
|
find_package(Tracy REQUIRED)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(OSGEARTH_BUILD_ZIP_PLUGIN)
|
||
|
|
- find_package(LIBZIP REQUIRED)
|
||
|
|
+ find_package(libzip CONFIG REQUIRED)
|
||
|
|
+ set(LIBZIP_LIBRARY libzip::zip)
|
||
|
|
+ set(LIBZIP_FOUND 1)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(OSGEARTH_BUILD_TRITON_NODEKIT)
|
||
|
|
@@ -193,7 +214,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
|
||
|
|
# TinyXML is an XML parsing library
|
||
|
|
SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
|
||
|
|
IF (WITH_EXTERNAL_TINYXML)
|
||
|
|
- find_package(TinyXML REQUIRED)
|
||
|
|
+ find_package(tinyxml CONFIG REQUIRED)
|
||
|
|
+ set(TINYXML_FOUND 1)
|
||
|
|
+ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
|
||
|
|
ENDIF (WITH_EXTERNAL_TINYXML)
|
||
|
|
|
||
|
|
# postfix settings for various configs
|