From b203287daf521ea4182c76ed1d7adf0cbe8e04c2 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 7 Sep 2025 18:56:57 +0200 Subject: [PATCH 1/2] FindCOLLADA.cmake: Fix ELSEIF() w/o argument warning in CMake-4.1.0 Signed-off-by: Andreas Sturmlechner --- CMakeModules/FindCOLLADA.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 7caf3545eb8..6a8f271e788 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -313,7 +313,7 @@ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY) IF (COLLADA_INCLUDE_DOMANY_DIR) SET(COLLADA_DOM_2_4_OR_LATER TRUE) - ELSEIF() + ELSE() SET(COLLADA_DOM_2_4_OR_LATER FALSE) ENDIF() From b5fc56baf3ef253aad39d65f61823ce0128620c0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 7 Sep 2025 15:13:57 +0200 Subject: [PATCH 2/2] Use more GNUInstalldirs (CMAKE_INSTALL_DOCDIR) Signed-off-by: Andreas Sturmlechner --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4abbc86d3aa..096594dc0e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1191,7 +1191,7 @@ IF(BUILD_DOCUMENTATION) ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY ) #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) - INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc) + INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT openscenegraph-doc) # now set up openthreads documentation generation IF(BUILD_REF_DOCS_TAGFILE) @@ -1207,7 +1207,7 @@ IF(BUILD_DOCUMENTATION) ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY ) #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) - INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc) + INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT openthreads-doc) # Process our other doxyfiles but don't create targets for these CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile