]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/osgearth/fix-dependencies.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / osgearth / fix-dependencies.patch
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 001ebf1..8e49af2 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -128,24 +128,45 @@ ENDIF (OSGEARTH_USE_GLES)
6
7 # required
8 find_package(OSG REQUIRED)
9 -find_package(CURL REQUIRED)
10 +find_package(CURL CONFIG REQUIRED)
11 +set(CURL_LIBRARY CURL::libcurl)
12 +
13 find_package(GDAL REQUIRED)
14 +set(GDAL_LIBRARY ${GDAL_LIBRARIES})
15 +set(GDAL_FOUND 1)
16
17 # optional
18 -find_package(GEOS REQUIRED)
19 -find_package(Sqlite3 REQUIRED)
20 +find_package(geos CONFIG REQUIRED)
21 +set(GEOS_LIBRARY GEOS::geos GEOS::geos_c)
22 +set(GEOS_FOUND 1)
23 +
24 +find_package(unofficial-sqlite3 CONFIG REQUIRED)
25 +set(SQLITE3_FOUND 1)
26 +set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3)
27 +
28 find_package(Draco REQUIRED)
29 find_package(BASISU REQUIRED)
30 +
31 find_package(GLEW REQUIRED)
32 -find_package(Protobuf REQUIRED)
33 -find_package(WEBP REQUIRED)
34 +set(GLEW_LIBRARIES GLEW::GLEW)
35 +set(GLEW_FOUND 1)
36 +
37 +find_package(protobuf CONFIG REQUIRED)
38 +set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf)
39 +set(Protobuf_FOUND 1)
40 +
41 +find_package(WebP CONFIG REQUIRED)
42 +set(WEBP_LIBRARY WebP::webp)
43 +set(WEBP_FOUND 1)
44
45 if(OSGEARTH_ENABLE_PROFILING)
46 find_package(Tracy REQUIRED)
47 endif()
48
49 if(OSGEARTH_BUILD_ZIP_PLUGIN)
50 - find_package(LIBZIP REQUIRED)
51 + find_package(libzip CONFIG REQUIRED)
52 + set(LIBZIP_LIBRARY libzip::zip)
53 + set(LIBZIP_FOUND 1)
54 endif()
55
56 if(OSGEARTH_BUILD_TRITON_NODEKIT)
57 @@ -193,7 +214,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
58 # TinyXML is an XML parsing library
59 SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
60 IF (WITH_EXTERNAL_TINYXML)
61 - find_package(TinyXML REQUIRED)
62 + find_package(tinyxml CONFIG REQUIRED)
63 + set(TINYXML_FOUND 1)
64 + set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
65 ENDIF (WITH_EXTERNAL_TINYXML)
66
67 # postfix settings for various configs