openscenegraph: migrate to Conan v2

recipes/openscenegraph/all/CMakeLists.txt

@@ -1,23 +1,44 @@
-cmake_minimum_required(VERSION 3.1.2)
+cmake_minimum_required(VERSION 3.15)
 project(cmake_wrapper)
 
-include(${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(NO_OUTPUT_DIRS)
+macro(custom_find_package name variable)
+    string(TOUPPER ${name} name_upper)
+    if(${variable})
+        find_package(${name} ${ARGN} REQUIRED CONFIG
+            # Allow only Conan packages
+            NO_DEFAULT_PATH
+            PATHS ${CMAKE_PREFIX_PATH}
+        )
+        set(${name_upper}_FOUND TRUE)
+        set(${name_upper}_VERSION_STRING ${${name}_VERSION_STRING})
+        set(${name_upper}_INCLUDE_DIRS ${${name}_INCLUDE_DIRS})
+        set(${name_upper}_INCLUDE_DIR ${${name}_INCLUDE_DIR})
+        set(${name_upper}_LIBRARIES ${${name}_LIBRARIES})
+        set(${name_upper}_DEFINITIONS ${${name}_DEFINITIONS})
+        unset(name_upper)
+    else()
+        set(${name}_FOUND FALSE)
+        set(${name_upper}_FOUND FALSE)
+    endif()
+endmacro()
 
-# 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)
+custom_find_package(Boost OSG_WITH_ASIO)
+custom_find_package(Asio OSG_WITH_ASIO)
+custom_find_package(CURL OSG_WITH_CURL)
+custom_find_package(Fontconfig OSG_TEXT_USE_FONTCONFIG)
+custom_find_package(Freetype OSG_WITH_FREETYPE)
+custom_find_package(GDAL OSG_WITH_GDAL)
+custom_find_package(GIFLIB OSG_WITH_GIFLIB)
+custom_find_package(GTA OSG_WITH_GTA)
+custom_find_package(JPEG OSG_WITH_JPEG)
+custom_find_package(Jasper OSG_WITH_JASPER)
+custom_find_package(OpenEXR OSG_WITH_OPENEXR)
+custom_find_package(PNG OSG_WITH_PNG)
+custom_find_package(TIFF OSG_WITH_TIFF)
+custom_find_package(ZLIB OSG_WITH_ZLIB)
+custom_find_package(DCMTK OSG_WITH_DCMTK)
+# custom_find_package(Poppler)
+# custom_find_package(RSVG)
+# custom_find_package(SDL2)
 
-# 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")
+add_subdirectory(src)

recipes/openscenegraph/all/conan-official-osg-variables.cmake

@@ -0,0 +1,23 @@
+# Reproduce https://github.com/openscenegraph/OpenSceneGraph/blob/master/packaging/cmake/OpenSceneGraphConfig.cmake.in
+# Component-specific variables are not created. Use the component targets instead.
+
+# Only export these for the OpenSceneGraph config file, not FindOSG.cmake
+if(NOT DEFINED OSG_LIBRARIES)
+    set(OPENSCENEGRAPH_FOUND TRUE)
+    set(OPENSCENEGRAPH_LIBRARIES ${OpenSceneGraph_LIBRARIES})
+    set(OPENSCENEGRAPH_INCLUDE_DIR ${OpenSceneGraph_INCLUDE_DIRS})
+    set(OPENSCENEGRAPH_INCLUDE_DIRS ${OpenSceneGraph_INCLUDE_DIRS})
+
+    set(OPENSCENEGRAPH_VERSION ${OpenSceneGraph_VERSION})
+    set(OPENSCENEGRAPH_VERSION_STRING ${OpenSceneGraph_VERSION_STRING})
+
+    set(OSG_LIBRARY ${OpenSceneGraph_LIBRARIES})
+    set(OSG_LIBRARIES ${OpenSceneGraph_LIBRARIES})
+    set(OSG_INCLUDE_DIR ${OpenSceneGraph_INCLUDE_DIRS})
+    set(OSG_INCLUDE_DIRS ${OpenSceneGraph_INCLUDE_DIRS})
+endif()
+
+# Reproduce https://github.com/openscenegraph/OpenSceneGraph/blob/master/CMakeModules/FindOpenThreads.cmake
+set(OPENTHREADS_FOUND TRUE)
+set(OPENTHREADS_INCLUDE_DIR ${OpenSceneGraph_INCLUDE_DIRS})
+set(OPENTHREADS_LIBRARY OpenThreads::OpenThreads)

recipes/openscenegraph/all/conandata.yml

@@ -1,18 +1,26 @@
 sources:
   3.6.5:
-    sha256: aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12
-    url: https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
+    url: "https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz"
+    sha256: "aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12"
 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
     - patch_file: patches/0006-Declare-result-as-LONG-for-Mingw-build.patch
-      base_path: source_subfolder
+    - patch_file: patches/0007-fix-msvc-with-std-c++17.patch
+      patch_type: bugfix
+      patch_source: https://github.com/openscenegraph/OpenSceneGraph/pull/1055
+    - patch_file: patches/0008-replace-mem-fun-ref.patch
+      patch_type: bugfix
+      patch_source: https://github.com/openscenegraph/OpenSceneGraph/commit/8a0114a46a4bad9041297950fe3bfbb2aea6e1da
+    - patch_file: patches/0009-replace-auto-ptr-in-plugins.patch
+      patch_type: portability
+      patch_source: https://github.com/openscenegraph/OpenSceneGraph/pull/1246
+    - patch_file: patches/0010-replace-ptr-fun-in-obj-plugin.patch
+      patch_type: portability
+      patch_source: https://github.com/openscenegraph/OpenSceneGraph/pull/1246
+    - patch_file: patches/0011-remove-deprecated-register.patch
+      patch_type: portability
+      patch_source:
+        - https://github.com/openscenegraph/OpenSceneGraph/pull/1296
+        - https://github.com/openscenegraph/OpenSceneGraph/pull/951