[osgearth] Fix x64-windows-static-md (#15375)

* osgearth:x64-windows-static-md fixes * Try to build for x64-windows-static-md * Fix builds * Indent and combine blocks * overwrite version * merge with master and update version * revert incorrect version changes * [osgearth] Improve portfile.cmake, add feature tools * update version record * disable fontconfig on windows * update version * [osgearth] Fix dependencies * [osgearth] Re-fix dependencies * [osgearth] Fix the sequence of linking osg * [osgearth] Fix dependency osg * update version record * Fix osgearth:x64-linux * x64-windows-static-md fixes * Fix x64-linux * Build fixes * Update x-add-version Co-authored-by: ankurv <[email protected]> Co-authored-by: JackBoosY <[email protected]>
microsoft · Mar 25, 2021 · 5a10163 · 5a10163
1 parent c2e1d32
commit 5a10163
Show file tree

Hide file tree

Showing 13 changed files with 442 additions and 55 deletions.
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
@@ -1,6 +1,6 @@
 Source: osg
 Version: 3.6.5
-Port-Version: 6
+Port-Version: 7
 Homepage: https://github.com/openscenegraph/OpenSceneGraph
 Description:  The OpenSceneGraph is an open source high performance 3D graphics toolkit.
 Build-Depends: zlib, fontconfig (!windows), expat (windows), openimageio (osx)

diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
@@ -54,6 +54,11 @@ if (VCPKG_TARGET_IS_WINDOWS AND OSG_DYNAMIC)
 endif()
 list(APPEND OPTIONS -DENABLE_NVTT=${ENABLE_NVTT})
 
+if (VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=ON)
+    list(APPEND OPTIONS -DOSG_TEXT_USE_FONTCONFIG=OFF)
+endif()
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     tools BUILD_OSG_APPLICATIONS
     examples BUILD_OSG_EXAMPLES

diff --git a/ports/osgearth/StaticOSG.patch b/ports/osgearth/StaticOSG.patch
@@ -0,0 +1,84 @@
+From 4e719ceacdc8df729f3296f62c9f50075c862967 Mon Sep 17 00:00:00 2001
+From: Ankur Verma <[email protected]>
+Date: Sun, 27 Dec 2020 22:26:32 -0800
+Subject: [PATCH] StaticOSG
+
+---
+ CMakeLists.txt              |  9 ++++++
+ CMakeModules/FindGEOS.cmake | 29 +++++++++++++++++++++++++++--
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 049e37e..d75a3b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -266,6 +266,15 @@ ELSE()
+     SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC")
+ ENDIF()
+
++IF(NOT OSGEARTH_BUILD_SHARED_LIBS)
++    ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC)
++ENDIF()
++
++OPTION(OSG_IS_STATIC "Set to ON to build OSG for static linking.  Use OFF for dynamic." OFF)
++IF (OSG_IS_STATIC)
++    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
++    LINK_LIBRARIES(${CMAKE_DL_LIBS})
++ENDIF(OSG_IS_STATIC)
+
+ # OE Libraries
+ ADD_SUBDIRECTORY(src)
+diff --git a/CMakeModules/FindGEOS.cmake b/CMakeModules/FindGEOS.cmake
+index e85f922..b1bbfed 100644
+--- a/CMakeModules/FindGEOS.cmake
++++ b/CMakeModules/FindGEOS.cmake
+@@ -65,7 +65,7 @@ FIND_LIBRARY(GEOS_LIBRARY
+ )
+
+ FIND_LIBRARY(GEOS_LIBRARY_DEBUG
+-  NAMES geos_cd geos_i_d geosd
++  NAMES geos_cd geos_i_d
+   PATHS
+     ${GEOS_DIR}/lib
+     $ENV{GEOS_DIR}
+@@ -74,7 +74,7 @@ FIND_LIBRARY(GEOS_LIBRARY_DEBUG
+ )
+
+ FIND_LIBRARY(GEOS_LIBRARY_DEBUG
+-  NAMES geos_cd geos_i_d geosd
++  NAMES geos_cd geos_i_d
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+@@ -92,3 +92,28 @@ SET(GEOS_FOUND "NO")
+ IF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR)
+   SET(GEOS_FOUND "YES")
+ ENDIF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR)
++
++OPTION(GEOS_IS_STATIC "Set to ON to build GEOS for static linking.  Use OFF for dynamic." OFF)
++IF (GEOS_IS_STATIC)
++  FIND_LIBRARY(GEOS_CXX_LIBRARY
++    NAMES geos
++    PATHS
++      ${GEOS_DIR}/lib
++      $ENV{GEOS_DIR}
++    NO_DEFAULT_PATH
++    PATH_SUFFIXES lib64 lib
++  )
++
++  FIND_LIBRARY(GEOS_CXX_LIBRARY_DEBUG
++    NAMES geosd
++    PATHS
++      ${GEOS_DIR}/lib
++      $ENV{GEOS_DIR}
++    NO_DEFAULT_PATH
++    PATH_SUFFIXES lib64 lib
++  )
++
++  set(GEOS_LIBRARY "${GEOS_LIBRARY};${GEOS_CXX_LIBRARY}" CACHE STRING "Geos Libraries" FORCE )
++  set(GEOS_LIBRARY_DEBUG "${GEOS_LIBRARY_DEBUG};${GEOS_CXX_LIBRARY_DEBUG}" CACHE STRING "Geos Debug Libraries" FORCE )
++
++ENDIF(GEOS_IS_STATIC)
+-- 
+2.29.2
+
diff --git a/ports/osgearth/deprecated_cpp_fix.patch b/ports/osgearth/deprecated_cpp_fix.patch
@@ -0,0 +1,28 @@
+From 89bea8378ae632b0caa134293f713b927774ab50 Mon Sep 17 00:00:00 2001
+From: ankurv <[email protected]>
+Date: Sun, 3 Jan 2021 11:05:32 -0800
+Subject: [PATCH] Patch
+
+---
+ src/osgEarth/Threading | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/osgEarth/Threading b/src/osgEarth/Threading
+index 9093ca6..0fbd9ce 100644
+--- a/src/osgEarth/Threading
++++ b/src/osgEarth/Threading
+@@ -602,7 +602,11 @@ namespace osgEarth { namespace Threading
+     template<typename Fn, typename... Args>
+     constexpr auto cpp11invoke(Fn&& f, Args&&... args)
+         noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
++#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
++        -> typename std::invoke_result<Fn(Args...)>::type
++#else
+         -> typename std::result_of<Fn(Args...)>::type
++#endif
+     {
+         return std::forward<Fn>(f)(std::forward<Args>(args)...);
+     }
+-- 
+2.29.2.windows.3
+
diff --git a/ports/osgearth/fix-dependencies.patch b/ports/osgearth/fix-dependencies.patch
@@ -0,0 +1,67 @@
+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
diff --git a/ports/osgearth/fix-dependency-osg.patch b/ports/osgearth/fix-dependency-osg.patch
@@ -0,0 +1,171 @@
+diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake
+index b7dff11..d1ec2ff 100644
+--- a/CMakeModules/FindOSG.cmake
++++ b/CMakeModules/FindOSG.cmake
+@@ -121,5 +121,36 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
+     SET( OSG_FOUND "YES" )
+     SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} )
+     GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH )
++    
++    find_package(ZLIB REQUIRED)
++    set(ZLIB_LIBRARY ZLIB::ZLIB)
++    
++    find_package(Freetype REQUIRED)
++    set(FREETYPE_LIBRARY Freetype::Freetype)
++    
++    find_package(unofficial-brotli CONFIG REQUIRED)
++    find_package(BZip2 REQUIRED)
++    find_package(expat CONFIG REQUIRED)
++    find_package(PNG REQUIRED)
++    find_package(JPEG REQUIRED)
++    find_package(TIFF REQUIRED)
++    find_package(zstd REQUIRED)
++    find_package(GIF REQUIRED)
++
++    if (UNIX)
++        list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread)
++        # Due to Linux Linker dependency issues these need to included again
++        set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio)
++    else(UNIX)
++        set(DEPEND_LIB_LIST cfitsio)
++    endif()
++    foreach (libname ${DEPEND_LIB_LIST})
++        find_library(${libname}_LIBRARY_RELEASE NAMES ${libname}  NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
++        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)
++        select_library_configurations(${libname})
++        list(APPEND OSG_DEPENDS_LIBRARY ${${libname}_LIBRARY})
++    endforeach()
++    list(APPEND OSG_DEPENDS_LIBRARY ZLIB::ZLIB Freetype::Freetype expat::expat PNG::PNG JPEG::JPEG TIFF::TIFF ${GIF_LIBRARIES} ${CFITSIO_LIBRARY})
++
+ ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
+
+diff --git a/src/applications/osgearth_3pv/CMakeLists.txt b/src/applications/osgearth_3pv/CMakeLists.txt
+index e1dc876..6d688ff 100644
+--- a/src/applications/osgearth_3pv/CMakeLists.txt
++++ b/src/applications/osgearth_3pv/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_3pv.cpp )
+
+diff --git a/src/applications/osgearth_atlas/CMakeLists.txt b/src/applications/osgearth_atlas/CMakeLists.txt
+index aadbb5e..69698c7 100644
+--- a/src/applications/osgearth_atlas/CMakeLists.txt
++++ b/src/applications/osgearth_atlas/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_atlas.cpp )
+
+diff --git a/src/applications/osgearth_boundarygen/CMakeLists.txt b/src/applications/osgearth_boundarygen/CMakeLists.txt
+index fe9ec6b..52915b0 100644
+--- a/src/applications/osgearth_boundarygen/CMakeLists.txt
++++ b/src/applications/osgearth_boundarygen/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_H
+     BoundaryUtil
+diff --git a/src/applications/osgearth_clamp/CMakeLists.txt b/src/applications/osgearth_clamp/CMakeLists.txt
+index 996ea43..728ee77 100644
+--- a/src/applications/osgearth_clamp/CMakeLists.txt
++++ b/src/applications/osgearth_clamp/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_clamp.cpp)
+
+diff --git a/src/applications/osgearth_conv/CMakeLists.txt b/src/applications/osgearth_conv/CMakeLists.txt
+index a77d703..2aac5f2 100644
+--- a/src/applications/osgearth_conv/CMakeLists.txt
++++ b/src/applications/osgearth_conv/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_conv.cpp )
+
+diff --git a/src/applications/osgearth_overlayviewer/CMakeLists.txt b/src/applications/osgearth_overlayviewer/CMakeLists.txt
+index bb2802a..5175cfc 100644
+--- a/src/applications/osgearth_overlayviewer/CMakeLists.txt
++++ b/src/applications/osgearth_overlayviewer/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_overlayviewer.cpp )
+
+diff --git a/src/applications/osgearth_tfs/CMakeLists.txt b/src/applications/osgearth_tfs/CMakeLists.txt
+index 90c153a..d331019 100644
+--- a/src/applications/osgearth_tfs/CMakeLists.txt
++++ b/src/applications/osgearth_tfs/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_tfs.cpp )
+
+diff --git a/src/applications/osgearth_toc/CMakeLists.txt b/src/applications/osgearth_toc/CMakeLists.txt
+index b32c523..7b25b79 100644
+--- a/src/applications/osgearth_toc/CMakeLists.txt
++++ b/src/applications/osgearth_toc/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGWIDGET_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_toc.cpp )
+
+diff --git a/src/applications/osgearth_version/CMakeLists.txt b/src/applications/osgearth_version/CMakeLists.txt
+index 1f1d48d..01e963b 100644
+--- a/src/applications/osgearth_version/CMakeLists.txt
++++ b/src/applications/osgearth_version/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_version.cpp )
+
+diff --git a/src/applications/osgearth_viewer/CMakeLists.txt b/src/applications/osgearth_viewer/CMakeLists.txt
+index 8c61e42..bbda7be 100644
+--- a/src/applications/osgearth_viewer/CMakeLists.txt
++++ b/src/applications/osgearth_viewer/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
+
+ SET(TARGET_SRC osgearth_viewer.cpp )
+
+diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
+index c49bfcd..a7b9a2d 100644
+--- a/src/osgEarth/CMakeLists.txt
++++ b/src/osgEarth/CMakeLists.txt
+@@ -870,9 +870,11 @@ ENDIF(TRACY_FOUND)
+
+ OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
+ if(NOT NRL_STATIC_LIBRARIES)
+-  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)
++  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)
++  TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES})
+ else(NOT NRL_STATIC_LIBRARIES)
+-  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)
++  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)
++  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})
+ endif(NOT NRL_STATIC_LIBRARIES)
+
+ LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY})
diff --git a/ports/osgearth/fix-tinyxml.patch b/ports/osgearth/fix-tinyxml.patch