Add openscenegraph/3.6.5

recipes/openscenegraph/all/CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.1.2)
+project(cmake_wrapper)
+
+include(${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(NO_OUTPUT_DIRS)
+
+# Hack to insure that conan's copy of these are used, rather than CMake's
+# If this isn't here, find_package(X11) will pull in CMake's copy
+find_package(Freetype QUIET)
+find_package(Fontconfig QUIET)
+
+# Workaround limitations of the cmake_find_package generator
+set(FREETYPE_FOUND ${Freetype_FOUND})
+if(FREETYPE_FOUND)
+    set(FREETYPE_LIBRARIES ${Freetype_LIBRARIES})
+    set(FREETYPE_INCLUDE_DIRS ${Freetype_INCLUDE_DIRS})
+endif()
+
+if(APPLE)
+    add_compile_definitions("GL_SILENCE_DEPRECATION")
+endif()
+
+add_subdirectory("source_subfolder")

recipes/openscenegraph/all/conandata.yml

@@ -0,0 +1,16 @@
+sources:
+  3.6.5:
+    sha256: aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12
+    url: https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
+patches:
+  3.6.5:
+    - patch_file: patches/0001-fix-to_cmake_path-usage.patch
+      base_path: source_subfolder
+    - patch_file: patches/0002-Use-standard-CMake-name-for-gif.patch
+      base_path: source_subfolder
+    - patch_file: patches/0003-Correct-usage-of-_LIBRARY-to-_LIBRARIES.patch
+      base_path: source_subfolder
+    - patch_file: patches/0004-Allow-explicit-control-of-plugins.patch
+      base_path: source_subfolder
+    - patch_file: patches/0005-use-JPEG-target-for-plugin.patch
+      base_path: source_subfolder

recipes/openscenegraph/all/patches/0001-fix-to_cmake_path-usage.patch

@@ -0,0 +1,31 @@
+From bfdb151022c98b065a839a4fbf2995ef9340f6ae Mon Sep 17 00:00:00 2001
+From: "R. Andrew Ohana" <rao@esi-group.com>
+Date: Mon, 21 Sep 2020 10:37:10 -0700
+Subject: [PATCH 1/5] fix to_cmake_path usage
+
+---
+ CMakeModules/OsgMacroUtils.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index dcc1fe37d..c0c2da4e1 100644
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -174,11 +174,11 @@ MACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
+         # Using the output directory properties
+
+         # Global properties (All generators but VS & Xcode)
+-        FILE(TO_CMAKE_PATH TMPVAR "CMAKE_ARCHIVE_OUTPUT_DIRECTORY/${RELATIVE_OUTDIR}")
++        FILE(TO_CMAKE_PATH "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${RELATIVE_OUTDIR}" TMPVAR)
+         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${TMPVAR}")
+-        FILE(TO_CMAKE_PATH TMPVAR "CMAKE_RUNTIME_OUTPUT_DIRECTORY/${RELATIVE_OUTDIR}")
++        FILE(TO_CMAKE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${RELATIVE_OUTDIR}" TMPVAR)
+         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TMPVAR}")
+-        FILE(TO_CMAKE_PATH TMPVAR "CMAKE_LIBRARY_OUTPUT_DIRECTORY/${RELATIVE_OUTDIR}")
++        FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${RELATIVE_OUTDIR}" TMPVAR)
+         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${TMPVAR}")
+
+         # Per-configuration property (VS, Xcode)
+-- 
+2.21.0.windows.1
+

recipes/openscenegraph/all/patches/0002-Use-standard-CMake-name-for-gif.patch

@@ -0,0 +1,54 @@
+From 17ad9caac56282e89d0e6a62c9564b99e2736225 Mon Sep 17 00:00:00 2001
+From: "R. Andrew Ohana" <rao@esi-group.com>
+Date: Thu, 17 Sep 2020 16:51:45 -0700
+Subject: [PATCH 2/5] Use standard CMake name for gif
+
+---
+ CMakeLists.txt                    | 2 +-
+ src/osgPlugins/CMakeLists.txt     | 2 +-
+ src/osgPlugins/gif/CMakeLists.txt | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ef2edd33..5e0c8f349 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -813,7 +813,7 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ # can use Quicktime.
+ IF(NOT ANDROID)
+     IF(NOT APPLE)
+-        FIND_PACKAGE(GIFLIB)
++        FIND_PACKAGE(GIF)
+         FIND_PACKAGE(JPEG)
+         FIND_PACKAGE(PNG)
+         FIND_PACKAGE(TIFF)
+diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
+index 812550412..2a88684b5 100644
+--- a/src/osgPlugins/CMakeLists.txt
++++ b/src/osgPlugins/CMakeLists.txt
+@@ -108,7 +108,7 @@ ENDIF()
+ IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+     ADD_PLUGIN_DIRECTORY(exr)
+ ENDIF()
+-IF(GIFLIB_FOUND)
++IF(GIF_FOUND)
+     ADD_PLUGIN_DIRECTORY(gif)
+ ENDIF()
+ IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+diff --git a/src/osgPlugins/gif/CMakeLists.txt b/src/osgPlugins/gif/CMakeLists.txt
+index 642339af1..0db0296cc 100644
+--- a/src/osgPlugins/gif/CMakeLists.txt
++++ b/src/osgPlugins/gif/CMakeLists.txt
+@@ -1,7 +1,7 @@
+-INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES( ${GIF_INCLUDE_DIR} )
+
+ SET(TARGET_SRC ReaderWriterGIF.cpp )
+-SET(TARGET_LIBRARIES_VARS GIFLIB_LIBRARY )
++SET(TARGET_LIBRARIES_VARS GIF_LIBRARY )
+ #### end var setup  ###
+ SETUP_PLUGIN(gif)
+
+-- 
+2.21.0.windows.1
+

recipes/openscenegraph/all/patches/0003-Correct-usage-of-_LIBRARY-to-_LIBRARIES.patch

@@ -0,0 +1,155 @@
+From 4925ff028681f79b8c0cb1d8e0772ca026c6e63e Mon Sep 17 00:00:00 2001
+From: "R. Andrew Ohana" <rao@esi-group.com>
+Date: Thu, 17 Sep 2020 17:06:49 -0700
+Subject: [PATCH 3/5] Correct usage of *_LIBRARY to *_LIBRARIES
+
+---
+ src/osgPlugins/curl/CMakeLists.txt | 4 ++--
+ src/osgPlugins/gdal/CMakeLists.txt | 2 +-
+ src/osgPlugins/gif/CMakeLists.txt  | 2 +-
+ src/osgPlugins/gta/CMakeLists.txt  | 2 +-
+ src/osgPlugins/jp2/CMakeLists.txt  | 2 +-
+ src/osgPlugins/jpeg/CMakeLists.txt | 2 +-
+ src/osgPlugins/ogr/CMakeLists.txt  | 2 +-
+ src/osgPlugins/png/CMakeLists.txt  | 2 +-
+ src/osgPlugins/tiff/CMakeLists.txt | 2 +-
+ src/osgPlugins/vnc/CMakeLists.txt  | 2 +-
+ 10 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/osgPlugins/curl/CMakeLists.txt b/src/osgPlugins/curl/CMakeLists.txt
+index 667631f07..4afb738c7 100644
+--- a/src/osgPlugins/curl/CMakeLists.txt
++++ b/src/osgPlugins/curl/CMakeLists.txt
+@@ -23,11 +23,11 @@ SET(TARGET_H
+
+ IF(ZLIB_FOUND)   
+     SET(TARGET_LIBRARIES_VARS
+-        CURL_LIBRARY
++        CURL_LIBRARIES
+         ZLIB_LIBRARIES)
+ ELSE()
+     SET(TARGET_LIBRARIES_VARS
+-        CURL_LIBRARY)
++        CURL_LIBRARIES)
+ ENDIF()
+
+ IF(WIN32 OR MINGW)
+diff --git a/src/osgPlugins/gdal/CMakeLists.txt b/src/osgPlugins/gdal/CMakeLists.txt
+index f1b670701..353bc9fc6 100644
+--- a/src/osgPlugins/gdal/CMakeLists.txt
++++ b/src/osgPlugins/gdal/CMakeLists.txt
+@@ -9,7 +9,7 @@ SET(TARGET_H
+     DataSetLayer.h
+ )
+
+-SET(TARGET_LIBRARIES_VARS GDAL_LIBRARY )
++SET(TARGET_LIBRARIES_VARS GDAL_LIBRARIES )
+ SET(TARGET_ADDED_LIBRARIES osgTerrain )
+
+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+diff --git a/src/osgPlugins/gif/CMakeLists.txt b/src/osgPlugins/gif/CMakeLists.txt
+index 0db0296cc..99d1e26dc 100644
+--- a/src/osgPlugins/gif/CMakeLists.txt
++++ b/src/osgPlugins/gif/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ INCLUDE_DIRECTORIES( ${GIF_INCLUDE_DIR} )
+
+ SET(TARGET_SRC ReaderWriterGIF.cpp )
+-SET(TARGET_LIBRARIES_VARS GIF_LIBRARY )
++SET(TARGET_LIBRARIES_VARS GIF_LIBRARIES )
+ #### end var setup  ###
+ SETUP_PLUGIN(gif)
+
+diff --git a/src/osgPlugins/gta/CMakeLists.txt b/src/osgPlugins/gta/CMakeLists.txt
+index 2b910a628..16466fefc 100644
+--- a/src/osgPlugins/gta/CMakeLists.txt
++++ b/src/osgPlugins/gta/CMakeLists.txt
+@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GTA_INCLUDE_DIRS} )
+
+ SET(TARGET_SRC ReaderWriterGTA.cpp )
+
+-SET(TARGET_LIBRARIES_VARS GTA_LIBRARY)
++SET(TARGET_LIBRARIES_VARS GTA_LIBRARIES)
+
+ #### end var setup  ###
+ SETUP_PLUGIN(gta)
+diff --git a/src/osgPlugins/jp2/CMakeLists.txt b/src/osgPlugins/jp2/CMakeLists.txt
+index b95537680..adcd84f64 100644
+--- a/src/osgPlugins/jp2/CMakeLists.txt
++++ b/src/osgPlugins/jp2/CMakeLists.txt
+@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${JASPER_INCLUDE_DIR} )
+
+ SET(TARGET_SRC ReaderWriterJP2.cpp )
+
+-SET(TARGET_LIBRARIES_VARS JASPER_LIBRARY )
++SET(TARGET_LIBRARIES_VARS JASPER_LIBRARIES )
+
+ IF(WIN32)
+    ADD_DEFINITIONS(-DJAS_WIN_MSVC_BUILD)
+diff --git a/src/osgPlugins/jpeg/CMakeLists.txt b/src/osgPlugins/jpeg/CMakeLists.txt
+index 7117713a0..2d290a29d 100644
+--- a/src/osgPlugins/jpeg/CMakeLists.txt
++++ b/src/osgPlugins/jpeg/CMakeLists.txt
+@@ -5,6 +5,6 @@ SET(TARGET_SRC
+     ReaderWriterJPEG.cpp
+ )
+
+-SET(TARGET_LIBRARIES_VARS JPEG_LIBRARY )
++SET(TARGET_LIBRARIES_VARS JPEG_LIBRARIES )
+ #### end var setup  ###
+ SETUP_PLUGIN(jpeg)
+diff --git a/src/osgPlugins/ogr/CMakeLists.txt b/src/osgPlugins/ogr/CMakeLists.txt
+index 01b71e360..ea8b9706a 100644
+--- a/src/osgPlugins/ogr/CMakeLists.txt
++++ b/src/osgPlugins/ogr/CMakeLists.txt
+@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} )
+
+ SET(TARGET_SRC ReaderWriterOGR.cpp)
+
+-SET(TARGET_LIBRARIES_VARS GDAL_LIBRARY )
++SET(TARGET_LIBRARIES_VARS GDAL_LIBRARIES )
+
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+     # Remove -Wshadow flag as it barfs on ffmoeg headers
+diff --git a/src/osgPlugins/png/CMakeLists.txt b/src/osgPlugins/png/CMakeLists.txt
+index 33df903d2..c4a6a2acc 100644
+--- a/src/osgPlugins/png/CMakeLists.txt
++++ b/src/osgPlugins/png/CMakeLists.txt
+@@ -5,7 +5,7 @@ IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
+ ENDIF()
+
+ SET(TARGET_SRC ReaderWriterPNG.cpp )
+-SET(TARGET_LIBRARIES_VARS PNG_LIBRARY ZLIB_LIBRARIES )
++SET(TARGET_LIBRARIES_VARS PNG_LIBRARIES ZLIB_LIBRARIES )
+
+
+ #### end var setup  ###
+diff --git a/src/osgPlugins/tiff/CMakeLists.txt b/src/osgPlugins/tiff/CMakeLists.txt
+index fc945d68e..6b856eab2 100644
+--- a/src/osgPlugins/tiff/CMakeLists.txt
++++ b/src/osgPlugins/tiff/CMakeLists.txt
+@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )
+
+ SET(TARGET_SRC ReaderWriterTIFF.cpp )
+
+-SET(TARGET_LIBRARIES_VARS TIFF_LIBRARY)
++SET(TARGET_LIBRARIES_VARS TIFF_LIBRARIES)
+
+ #### end var setup  ###
+ SETUP_PLUGIN(tiff)
+diff --git a/src/osgPlugins/vnc/CMakeLists.txt b/src/osgPlugins/vnc/CMakeLists.txt
+index 9a54b2bf2..49bb2dce4 100644
+--- a/src/osgPlugins/vnc/CMakeLists.txt
++++ b/src/osgPlugins/vnc/CMakeLists.txt
+@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${LIBVNCSERVER_INCLUDE_DIR})
+ SET(TARGET_EXTERNAL_LIBRARIES
+     ${LIBVNCCLIENT_LIBRARY}
+     ${ZLIB_LIBRARIES}
+-    ${JPEG_LIBRARY} )
++    ${JPEG_LIBRARIES} )
+
+ SET(TARGET_ADDED_LIBRARIES osgWidget )
+
+-- 
+2.21.0.windows.1
+