Move to manual openscenegraph

trackpoint-app/CMakeLists.txt

@@ -25,19 +25,18 @@ LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/thirdparty/json/install
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/thirdparty/qt/install")
 
 # OpenSceneGraph
-INCLUDE(thirdparty/openscenegraph.cmake)
-#FIND_PACKAGE(OpenSceneGraph REQUIRED COMPONENTS osgViewer osgDB osgGA osgText osgUtil NO_CMAKE_SYSTEM_PATH)
+FIND_PACKAGE(OpenSceneGraph REQUIRED COMPONENTS osgViewer osgDB osgGA osgText osgUtil)
+
+# Qt
+FIND_PACKAGE(Qt6 COMPONENTS Widgets OpenGLWidgets REQUIRED NO_CMAKE_SYSTEM_PATH)
 
 # lib3mf
 INCLUDE(thirdparty/lib3mf.cmake)
-#FIND_PACKAGE(lib3mf REQUIRED NO_CMAKE_SYSTEM_PATH)
+#FIND_LIBRARY(LIB3MFLOCATION lib3mf REQUIRED PATHS ${CMAKE_CURRENT_LIST_DIR}/thirdparty/lib3mf/install)
 
 # Json
 FIND_PACKAGE(nlohmann_json REQUIRED NO_CMAKE_SYSTEM_PATH)
 
-# Qt
-FIND_PACKAGE(Qt6 COMPONENTS Widgets OpenGLWidgets REQUIRED NO_CMAKE_SYSTEM_PATH)
-
 # The executable we want to build
 QT_ADD_EXECUTABLE(TrackpointApp
   src/main.cpp
@@ -54,15 +53,14 @@ QT_ADD_EXECUTABLE(TrackpointApp
 )
 
 INCLUDE_DIRECTORIES(
-  ${${OPENSCENEGRAPH_PREFIX}_SOURCE_DIR}/include
-  ${${LIB3MF_PREFIX}_BINARY_DIR}/Autogenerated/Bindings/Cpp
-  ${${JSON_PREFIX}_SOURCE_DIR}/include
+  ${OPENSCENEGRAPH_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_LIST_DIR}/thirdparty/lib3mf/install/include/Bindings/Cpp
   include
   gui
 )
 
 TARGET_LINK_LIBRARIES(TrackpointApp PRIVATE
-  osg osgViewer osgDB osgGA osgText osgUtil
+  ${OPENSCENEGRAPH_LIBRARIES}
   lib3mf
   nlohmann_json::nlohmann_json
   Qt6::Widgets

trackpoint-app/thirdparty/openscenegraph.cmake

@@ -1,33 +0,0 @@
-# Build OpenSceneGraph
-
-# The GitHub release (tag) we want to use
-SET(OPENSCENEGRAPH_TAG OpenSceneGraph-3.6.5)
-
-SET(OPENSCENEGRAPH_PREFIX openscenegraph)
-
-SET(OPENSCENEGRAPH_URL https://github.com/openscenegraph/OpenSceneGraph)
-
-# Configure OpenSceneGraph
-SET(DYNAMIC_OPENSCENEGRAPH ON CACHE INTERNAL "")
-SET(DYNAMIC_OPENTHREADS ON CACHE INTERNAL "")
-SET(BUILD_OSG_EXAMPLES OFF CACHE INTERNAL "")
-SET(BUILD_OSG_APPLICATIONS OFF CACHE INTERNAL "")
-SET(OSG_TEXT_USE_FONTCONFIG OFF CACHE INTERNAL "")
-SET(OSG_GL_LIBRARY_STATIC OFF CACHE INTERNAL "")
-
-ADD_COMPILE_DEFINITIONS(OSG_LIBRARY_STATIC)
-
-# Add OpenSceneGraph
-FETCHCONTENT_DECLARE(
-  ${OPENSCENEGRAPH_PREFIX}
-  PREFIX ${OPENSCENEGRAPH_PREFIX}
-  GIT_REPOSITORY ${OPENSCENEGRAPH_URL}
-  GIT_TAG ${OPENSCENEGRAPH_TAG}
-)
-
-FETCHCONTENT_GETPROPERTIES(${OPENSCENEGRAPH_PREFIX})
-
-IF(NOT ${OPENSCENEGRAPH_PREFIX}_POPULATED)
-  FETCHCONTENT_POPULATE(${OPENSCENEGRAPH_PREFIX})
-  ADD_SUBDIRECTORY(${${OPENSCENEGRAPH_PREFIX}_SOURCE_DIR} ${${OPENSCENEGRAPH_PREFIX}_BINARY_DIR})
-ENDIF()