Clean up FindGLFW3.cmake

Author: xlz

examples/protonect/CMakeLists.txt

@@ -14,7 +14,7 @@ PROJECT(libfreenect2)
 SET(CMAKE_BUILD_TYPE RelWithDebInfo)
 
 SET(MY_DIR ${libfreenect2_SOURCE_DIR})
-SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${MY_DIR}/../../depends/libusb/lib/pkgconfig/:${MY_DIR}/../../depends/glfw/lib/pkgconfig/" )
+SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${MY_DIR}/../../depends/libusb/lib/pkgconfig/")
 
 OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
 OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)
@@ -130,34 +130,16 @@ SET(RESOURCES
 )
 
 IF(ENABLE_OPENGL)
-  auto_detect_lib(GLFW3)
-  
-  #Assuming local build witout global deps, ugly to to this automatic but to keep backward compatibiliy
-  if(NOT GLFW3_FOUND)
-    
-    MESSAGE(STATUS "Building local GLFW")
-    # GLFW
-    SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
-    SET(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Build the GLFW example programs")
-    SET(GLFW_BUILD_TESTS OFF CACHE BOOL "Build the GLFW test programs")
-    SET(GLFW_BUILD_DOCS OFF CACHE BOOL "Build the GLFW documentation")
-
-    ADD_SUBDIRECTORY(${MY_DIR}/../../depends/glfw_src/ ${MY_DIR}/../../depends/glfw)
-    INCLUDE_DIRECTORIES(${MY_DIR}/../../depends/glfw_src/include/)
-    
-    LIST(APPEND LIBRARIES
-      glfw
-    )
-    
-  else()
+  FIND_PACKAGE(GLFW3)
+  FIND_PACKAGE(OpenGL)
+  IF(GLFW3_FOUND)
     INCLUDE_DIRECTORIES(${GLFW3_INCLUDE_DIRS})
 
     LINK_DIRECTORIES(${GLFW3_LIBRARY_DIRS})
     LIST(APPEND LIBRARIES
       ${GLFW3_LIBRARIES}
+      ${OPENGL_gl_LIBRARY}
     )
-  endif()
-  
   SET(LIBFREENECT2_WITH_OPENGL_SUPPORT 1)
   LIST(APPEND SOURCES
     src/flextGL.c
@@ -172,6 +154,7 @@ IF(ENABLE_OPENGL)
     src/shader/stage1.fs
     src/shader/stage2.fs
   )
+  ENDIF()
 ENDIF(ENABLE_OPENGL)
 
 IF(ENABLE_OPENCL)

examples/protonect/cmake_modules/FindGLFW3.cmake

@@ -1,21 +1,52 @@
 # - Try to find GLFW3
 #
+# If no pkgconfig, define GLFW_ROOT to installation tree
 # Will define the following:
 # GLFW3_FOUND
 # GLFW3_INCLUDE_DIRS
 # GLFW3_LIBRARIES
 
-include(FindPackageHandleStandardArgs)
+IF(PKG_CONFIG_FOUND)
+  IF(APPLE)
+    # homebrew or macports pkgconfig locations
+    SET(ENV{PKG_CONFIG_PATH} "/usr/local/opt/glfw3/lib/pkgconfig:/opt/local/lib/pkgconfig")
+  ENDIF()
+  SET(ENV{PKG_CONFIG_PATH} "${CMAKE_SOURCE_DIR}/../../depends/glfw/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+  PKG_CHECK_MODULES(GLFW3 glfw3)
 
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  find_path(GLFW3_INCLUDE_DIRS 
-    glfw/glfw3.h 
-    DOC "GLFW include directory " 
-    PATHS $ENV{ProgramW6432}/glfw/include $ENV{GLFW_ROOT}/include)
-  
-  find_library(GLFW3_LIBRARIES
-    NAMES glfw3.lib glfw3dll.lib 
-    PATHS $ENV{ProgramW6432}/glfw/lib/ $ENV{GLFW_ROOT}/lib/)
+  RETURN()
 ENDIF()
 
-find_package_handle_standard_args(GLFW3 "Could not find GLFW3 - try adding GLFW_ROOT in enviroment variables." GLFW3_INCLUDE_DIRS GLFW3_LIBRARIES)
+FIND_PATH(GLFW3_INCLUDE_DIRS
+  GLFW/glfw3.h
+  DOC "GLFW include directory "
+  PATHS
+    "${CMAKE_SOURCE_DIR}/../../depends/glfw"
+    "$ENV{ProgramW6432}/glfw"
+    ENV GLFW_ROOT
+  PATH_SUFFIXES
+    include
+)
+
+# directories in the official binary package
+IF(MINGW)
+  SET(_SUFFIX lib-mingw)
+ELSEIF(MSVC11)
+  SET(_SUFFIX lib-vc2012)
+ELSEIF(MSVC)
+  SET(_SUFFIX lib-vc2013)
+ENDIF()
+
+FIND_LIBRARY(GLFW3_LIBRARIES
+  NAMES glfw3dll glfw3
+  PATHS
+    "${CMAKE_SOURCE_DIR}/../../depends/glfw"
+    "$ENV{ProgramW6432}/glfw"
+    ENV GLFW_ROOT
+  PATH_SUFFIXES
+    lib
+    ${_SUFFIX}
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW3 "Could NOT find GLFW3 - try adding GLFW_ROOT in enviroment variables." GLFW3_LIBRARIES GLFW3_INCLUDE_DIRS)