diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt OpenSceneGraph-OpenSceneGraph-3.6.5-new/CMakeLists.txt --- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt 2020-01-31 12:03:07.000000000 +0100 +++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/CMakeLists.txt 2021-11-13 21:34:02.371772942 +0100 @@ -1208,7 +1208,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 doc COMPONENT openscenegraph-doc) # now set up openthreads documentation generation IF(BUILD_REF_DOCS_TAGFILE) @@ -1224,7 +1224,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 doc COMPONENT openthreads-doc) # Process our other doxyfiles but don't create targets for these CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindFLTK.cmake OpenSceneGraph-OpenSceneGraph-3.6.5-new/CMakeModules/FindFLTK.cmake --- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindFLTK.cmake 2020-01-31 12:03:07.000000000 +0100 +++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/CMakeModules/FindFLTK.cmake 2021-11-13 21:34:02.372772943 +0100 @@ -18,7 +18,7 @@ if(EXISTS ${CMAKE_ROOT}/Modules/FindFLTK endif() endif() -FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h +FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.H FL/Fl.h $ENV{FLTK_DIR}/include $ENV{FLTK_DIR} ~/Library/Frameworks diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-OpenSceneGraph-3.6.5-new/CMakeModules/OsgMacroUtils.cmake --- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/OsgMacroUtils.cmake 2020-01-31 12:03:07.000000000 +0100 +++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/CMakeModules/OsgMacroUtils.cmake 2021-11-13 21:34:02.372772943 +0100 @@ -489,7 +489,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME) IF(APPLE) INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) ELSE(APPLE) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples ) IF(MSVC) INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo) INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug) diff -rupN --no-dereference OpenSceneGraph-OpenSceneGraph-3.6.5/examples/osgviewerSDL/CMakeLists.txt OpenSceneGraph-OpenSceneGraph-3.6.5-new/examples/osgviewerSDL/CMakeLists.txt --- OpenSceneGraph-OpenSceneGraph-3.6.5/examples/osgviewerSDL/CMakeLists.txt 2020-01-31 12:03:07.000000000 +0100 +++ OpenSceneGraph-OpenSceneGraph-3.6.5-new/examples/osgviewerSDL/CMakeLists.txt 2021-11-13 21:34:02.372772943 +0100 @@ -13,7 +13,7 @@ ELSE() # Depending on platform (or SDL version), # this may or may not link successfully. SET(TARGET_SRC osgviewerSDL.cpp) - SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} ) + SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} ) ENDIF() ENDIF()