build(examples): link to specific opengl targets

Signed-off-by: Benn Snyder <[email protected]>

Author: piedar

cmake_modules/ChooseOpenGLTarget.cmake

@@ -0,0 +1,11 @@
+# For maximum compatibility, choose the OpenGL target dynamically.
+# On Linux with GLVND
+#   OpenGL::OpenGL gives us just what we need without GLX or EGL
+#   OpenGL::GL works as a fallback, but only if GLX is available
+# On Linux without GLVND, OSX, Windows
+#   OpenGL::GL is the only option
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+  set(OPENGL_TARGET "$<IF:$<TARGET_EXISTS:OpenGL::OpenGL>,OpenGL::OpenGL,OpenGL::GL>")
+else()
+  set(OPENGL_TARGET "$<IF:$<BOOL:${OPENGL_opengl_LIBRARY}>,OpenGL::OpenGL,OpenGL::GL>")
+endif()

examples/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Packages needed for examples
 ######################################################################################
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.10)
 
 # These examples have no external dependencies and should always build.
 add_executable(freenect-camtest camtest.c)
@@ -14,12 +14,11 @@ install(TARGETS freenect-camtest freenect-wavrecord
 
 # Most viewers need pthreads and GLUT.
 set(THREADS_USE_PTHREADS_WIN32 true)
-set(OpenGL_GL_PREFERENCE "GLVND")
 find_package(Threads)
-find_package(OpenGL)
+find_package(OpenGL COMPONENTS OpenGL)
 find_package(GLUT)
 
-if (Threads_FOUND AND OPENGL_FOUND AND GLUT_FOUND)
+if (Threads_FOUND AND OpenGL_OpenGL_FOUND AND GLUT_FOUND)
   include_directories(${THREADS_PTHREADS_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
 
   add_executable(freenect-glview glview.c)
@@ -28,11 +27,12 @@ if (Threads_FOUND AND OPENGL_FOUND AND GLUT_FOUND)
   add_executable(freenect-chunkview chunkview.c)
   add_executable(freenect-micview micview.c)
 
-  target_link_libraries(freenect-glview freenect OpenGL::GL GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
-  target_link_libraries(freenect-regview freenect OpenGL::GL GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
-  target_link_libraries(freenect-hiview freenect OpenGL::GL GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
-  target_link_libraries(freenect-chunkview freenect OpenGL::GL GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
-  target_link_libraries(freenect-micview freenect OpenGL::GL GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+  include(ChooseOpenGLTarget)
+  target_link_libraries(freenect-glview freenect "${OPENGL_TARGET}" GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+  target_link_libraries(freenect-regview freenect "${OPENGL_TARGET}" GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+  target_link_libraries(freenect-hiview freenect "${OPENGL_TARGET}" GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+  target_link_libraries(freenect-chunkview freenect "${OPENGL_TARGET}" GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+  target_link_libraries(freenect-micview freenect "${OPENGL_TARGET}" GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
 
   install(TARGETS freenect-glview freenect-regview freenect-hiview freenect-chunkview freenect-micview
           DESTINATION bin)
@@ -51,10 +51,11 @@ if (BUILD_C_SYNC)
   install(TARGETS freenect-regtest freenect-tiltdemo
           DESTINATION bin)
 
-  if (OPENGL_FOUND AND GLUT_FOUND)
+  if (OpenGL_OpenGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
     include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
     add_executable(freenect-glpclview glpclview.c)
-    target_link_libraries(freenect-glpclview freenect_sync OpenGL::GL OpenGL::GLU GLUT::GLUT ${MATH_LIB})
+    include(ChooseOpenGLTarget)
+    target_link_libraries(freenect-glpclview freenect_sync "${OPENGL_TARGET}" OpenGL::GLU GLUT::GLUT ${MATH_LIB})
     install(TARGETS freenect-glpclview
             DESTINATION bin)
   endif ()

wrappers/cpp/CMakeLists.txt

@@ -1,16 +1,15 @@
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.10)
 
 install(FILES libfreenect.hpp
         DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
 
 if (BUILD_EXAMPLES)
   set(THREADS_USE_PTHREADS_WIN32 true)
-  set(OpenGL_GL_PREFERENCE "GLVND")
   find_package(Threads)
-  find_package(OpenGL)
+  find_package(OpenGL COMPONENTS OpenGL)
   find_package(GLUT)
 
-  if (Threads_FOUND AND OPENGL_FOUND AND GLUT_FOUND)
+  if (Threads_FOUND AND OpenGL_OpenGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
     include_directories(. ${THREADS_PTHREADS_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
 
     add_executable(freenect-cppview cppview.cpp)
@@ -19,8 +18,9 @@ if (BUILD_EXAMPLES)
     target_compile_features(freenect-cppview PUBLIC cxx_std_11)
     target_compile_features(freenect-cpp_pcview PUBLIC cxx_std_11)
 
-    target_link_libraries(freenect-cppview freenect OpenGL::GL OpenGL::GLU GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
-    target_link_libraries(freenect-cpp_pcview freenect OpenGL::GL OpenGL::GLU GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+    include(ChooseOpenGLTarget)
+    target_link_libraries(freenect-cppview freenect "${OPENGL_TARGET}" OpenGL::GLU GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+    target_link_libraries(freenect-cpp_pcview freenect "${OPENGL_TARGET}" OpenGL::GLU GLUT::GLUT ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
 
     install(TARGETS freenect-cppview freenect-cpp_pcview
             DESTINATION bin)