ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/osgearth/fix-dependency-osg.patch

   1 diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake
   2 index b7dff11..d1ec2ff 100644
   3 --- a/CMakeModules/FindOSG.cmake
   4 +++ b/CMakeModules/FindOSG.cmake
   5 @@ -121,5 +121,36 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
   6      SET( OSG_FOUND "YES" )
   7      SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} )
   8      GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH )
   9 +
  10 +    find_package(ZLIB REQUIRED)
  11 +    set(ZLIB_LIBRARY ZLIB::ZLIB)
  12 +
  13 +    find_package(Freetype REQUIRED)
  14 +    set(FREETYPE_LIBRARY Freetype::Freetype)
  15 +
  16 +    find_package(unofficial-brotli CONFIG REQUIRED)
  17 +    find_package(BZip2 REQUIRED)
  18 +    find_package(expat CONFIG REQUIRED)
  19 +    find_package(PNG REQUIRED)
  20 +    find_package(JPEG REQUIRED)
  21 +    find_package(TIFF REQUIRED)
  22 +    find_package(zstd REQUIRED)
  23 +    find_package(GIF REQUIRED)
  24 +
  25 +    if (UNIX)
  26 +        list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread)
  27 +        # Due to Linux Linker dependency issues these need to included again
  28 +        set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio)
  29 +    else(UNIX)
  30 +        set(DEPEND_LIB_LIST cfitsio)
  31 +    endif()
  32 +    foreach (libname ${DEPEND_LIB_LIST})
  33 +        find_library(${libname}_LIBRARY_RELEASE NAMES ${libname}  NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
  34 +        find_library(${libname}_LIBRARY_DEBUG NAMES ${libname} ${libname}d ${libname}_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
  35 +        select_library_configurations(${libname})
  36 +        list(APPEND OSG_DEPENDS_LIBRARY ${${libname}_LIBRARY})
  37 +    endforeach()
  38 +    list(APPEND OSG_DEPENDS_LIBRARY ZLIB::ZLIB Freetype::Freetype expat::expat PNG::PNG JPEG::JPEG TIFF::TIFF ${GIF_LIBRARIES} ${CFITSIO_LIBRARY})
  39 +
  40  ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
  41
  42 diff --git a/src/applications/osgearth_3pv/CMakeLists.txt b/src/applications/osgearth_3pv/CMakeLists.txt
  43 index e1dc876..6d688ff 100644
  44 --- a/src/applications/osgearth_3pv/CMakeLists.txt
  45 +++ b/src/applications/osgearth_3pv/CMakeLists.txt
  46 @@ -1,5 +1,5 @@
  47  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
  48 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
  49 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
  50
  51  SET(TARGET_SRC osgearth_3pv.cpp )
  52
  53 diff --git a/src/applications/osgearth_atlas/CMakeLists.txt b/src/applications/osgearth_atlas/CMakeLists.txt
  54 index aadbb5e..69698c7 100644
  55 --- a/src/applications/osgearth_atlas/CMakeLists.txt
  56 +++ b/src/applications/osgearth_atlas/CMakeLists.txt
  57 @@ -1,6 +1,6 @@
  58  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
  59
  60 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
  61 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
  62
  63  SET(TARGET_SRC osgearth_atlas.cpp )
  64
  65 diff --git a/src/applications/osgearth_boundarygen/CMakeLists.txt b/src/applications/osgearth_boundarygen/CMakeLists.txt
  66 index fe9ec6b..52915b0 100644
  67 --- a/src/applications/osgearth_boundarygen/CMakeLists.txt
  68 +++ b/src/applications/osgearth_boundarygen/CMakeLists.txt
  69 @@ -1,5 +1,5 @@
  70  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
  71 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
  72 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
  73
  74  SET(TARGET_H
  75      BoundaryUtil
  76 diff --git a/src/applications/osgearth_clamp/CMakeLists.txt b/src/applications/osgearth_clamp/CMakeLists.txt
  77 index 996ea43..728ee77 100644
  78 --- a/src/applications/osgearth_clamp/CMakeLists.txt
  79 +++ b/src/applications/osgearth_clamp/CMakeLists.txt
  80 @@ -1,5 +1,5 @@
  81  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
  82 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY)
  83 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
  84
  85  SET(TARGET_SRC osgearth_clamp.cpp)
  86
  87 diff --git a/src/applications/osgearth_conv/CMakeLists.txt b/src/applications/osgearth_conv/CMakeLists.txt
  88 index a77d703..2aac5f2 100644
  89 --- a/src/applications/osgearth_conv/CMakeLists.txt
  90 +++ b/src/applications/osgearth_conv/CMakeLists.txt
  91 @@ -1,5 +1,5 @@
  92  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
  93 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY)
  94 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
  95
  96  SET(TARGET_SRC osgearth_conv.cpp )
  97
  98 diff --git a/src/applications/osgearth_overlayviewer/CMakeLists.txt b/src/applications/osgearth_overlayviewer/CMakeLists.txt
  99 index bb2802a..5175cfc 100644
 100 --- a/src/applications/osgearth_overlayviewer/CMakeLists.txt
 101 +++ b/src/applications/osgearth_overlayviewer/CMakeLists.txt
 102 @@ -1,5 +1,5 @@
 103  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 104 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 105 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
 106
 107  SET(TARGET_SRC osgearth_overlayviewer.cpp )
 108
 109 diff --git a/src/applications/osgearth_tfs/CMakeLists.txt b/src/applications/osgearth_tfs/CMakeLists.txt
 110 index 90c153a..d331019 100644
 111 --- a/src/applications/osgearth_tfs/CMakeLists.txt
 112 +++ b/src/applications/osgearth_tfs/CMakeLists.txt
 113 @@ -1,6 +1,6 @@
 114  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 115
 116 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 117 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
 118
 119  SET(TARGET_SRC osgearth_tfs.cpp )
 120
 121 diff --git a/src/applications/osgearth_toc/CMakeLists.txt b/src/applications/osgearth_toc/CMakeLists.txt
 122 index b32c523..7b25b79 100644
 123 --- a/src/applications/osgearth_toc/CMakeLists.txt
 124 +++ b/src/applications/osgearth_toc/CMakeLists.txt
 125 @@ -1,5 +1,5 @@
 126  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 127 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY)
 128 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGWIDGET_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
 129
 130  SET(TARGET_SRC osgearth_toc.cpp )
 131
 132 diff --git a/src/applications/osgearth_version/CMakeLists.txt b/src/applications/osgearth_version/CMakeLists.txt
 133 index 1f1d48d..01e963b 100644
 134 --- a/src/applications/osgearth_version/CMakeLists.txt
 135 +++ b/src/applications/osgearth_version/CMakeLists.txt
 136 @@ -1,5 +1,5 @@
 137  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 138 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 139 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
 140
 141  SET(TARGET_SRC osgearth_version.cpp )
 142
 143 diff --git a/src/applications/osgearth_viewer/CMakeLists.txt b/src/applications/osgearth_viewer/CMakeLists.txt
 144 index 8c61e42..bbda7be 100644
 145 --- a/src/applications/osgearth_viewer/CMakeLists.txt
 146 +++ b/src/applications/osgearth_viewer/CMakeLists.txt
 147 @@ -1,5 +1,5 @@
 148  INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 149 -SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 150 +SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
 151
 152  SET(TARGET_SRC osgearth_viewer.cpp )
 153
 154 diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
 155 index c49bfcd..a7b9a2d 100644
 156 --- a/src/osgEarth/CMakeLists.txt
 157 +++ b/src/osgEarth/CMakeLists.txt
 158 @@ -870,9 +870,11 @@ ENDIF(TRACY_FOUND)
 159
 160  OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
 161  if(NOT NRL_STATIC_LIBRARIES)
 162 -  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)
 163 +  LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY)
 164 +  TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES})
 165  else(NOT NRL_STATIC_LIBRARIES)
 166 -  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY)
 167 +  LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY)
 168 +  TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES} ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY})
 169  endif(NOT NRL_STATIC_LIBRARIES)
 170
 171  LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY})