Added pkg-config support for linux to find libraries externally.

Fined some paths in libturbojpeg find-script to get it working on linux.
Changed name from GLEW_LIBRARY to GLEW_LIBRARIES to be compatible to pkg-config

Author: goldhoorn

.gitignore

@@ -1,5 +1,6 @@
 # generated resource file
 examples/protonect/src/resources.inc
+examples/protonect/build
 
 # Dependency folders
 depends/*/

examples/protonect/CMakeLists.txt

@@ -1,10 +1,36 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+
+function(auto_detect_lib LIBNAME)
+    if(NOT DEFINED ${${LIBNAME}_FOUND})
+        find_package(PkgConfig)
+        if ( PKG_CONFIG_FOUND )
+            string(TOLOWER ${LIBNAME} LOWER_${LIBNAME})
+            pkg_check_modules(${LIBNAME} ${ARGN} ${LOWER_${LIBNAME}})
+            MESSAGE("LIB ${LIBNAME} found and include is in ${${LIBNAME}_INCLUDE_DIRS}")
+        else()
+            MESSAGE("Fallback to non-pkg-config")
+            FIND_PACKAGE(${LIBNAME} ${ARGN})
+        endif()
+    else()
+        MESSAGE("WARNING lib was already known ${LIBNAME} becasue of ${${LIBNAME}_FOUND}")
+    endif()
+
+    if(NOT ${${LIBNAME}_FOUND})
+        MESSAGE("WARNING lib #{LIBNAME} Not found")
+    else()
+    endif()
+
+    MESSAGE("LIB ${LIBNAME} found and include is in ${${LIBNAME}_INCLUDE_DIRS}")
+    #Still include paths because we are assuming FOUND is givern externally
+    INCLUDE_DIRECTORIES(${${LIBNAME}_INCLUDE_DIRS})
+    LINK_DIRECTORIES(${${LIBNAME}_LIBRARY_DIRS})
+endfunction()
+
+
 PROJECT(libfreenect2)
 SET(CMAKE_BUILD_TYPE RelWithDebInfo)
 
-SET(MY_DIR ${libfreenect2_SOURCE_DIR})
-
 OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
 OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)
 
@@ -22,7 +48,7 @@ IF(ENABLE_CXX11)
 ENDIF(ENABLE_CXX11)
 
 # additional cmake modules
-LIST(APPEND CMAKE_MODULE_PATH ${MY_DIR}/cmake_modules)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
 
 # setup threading
 INCLUDE(SetupLibfreenect2Threading)
@@ -31,43 +57,53 @@ INCLUDE_DIRECTORIES(${LIBFREENECT2_THREADING_INCLUDE_DIR})
 INCLUDE(GenerateResources)
 
 #set the default path for built executables to the "bin" directory
-SET(EXECUTABLE_OUTPUT_PATH ${MY_DIR}/bin)
+SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
 #set the default path for built libraries to the "lib" directory
-SET(LIBRARY_OUTPUT_PATH ${MY_DIR}/lib)
+SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 
 FIND_PACKAGE(OpenCL)
-
-# dependencies
 FIND_PACKAGE(OpenCV REQUIRED)
-
-FIND_PACKAGE(libusb REQUIRED)
-
 FIND_PACKAGE(TurboJPEG REQUIRED)
 
-FIND_PACKAGE(GLEW REQUIRED)
 
+# dependencies
+auto_detect_lib(LibUsb REQUIRED)
+auto_detect_lib(GLEW REQUIRED)
+auto_detect_lib(GLEWmx REQUIRED)
+auto_detect_lib(GLFW3)
+
+    
 ADD_DEFINITIONS(-DGLEW_MX)
 
+#Our headers include libusb a bit haky, so we need to workaround the given path here
+INCLUDE_DIRECTORIES(${LibUsb_INCLUDEDIR}/libusb-1.0)
+
+
 # Add includes
-INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS} ${LibUSB_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${TJPEG_INCLUDE_DIR})
+#INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS} ${LibUSB_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${TJPEG_INCLUDE_DIR})
 
-# 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/)
+#Assuming local build witout global deps, ugly to to this automatic but to keep backward compatibiliy
+if(not ${GLFW_FOUND})
+    # 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(${CMAKE_CURRENT_SOURCE_DIR}/../../depends/glfw_src/ ${CMAKE_CURRENT_SOURCE_DIR}/../../depends/glfw)
+    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../depends/glfw_src/include/)
+endif()
 
 if(APPLE)
   # libjpeg-turbo
-  INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/libjpeg_turbo/include/")
-  LINK_DIRECTORIES("${MY_DIR}/../../depends/libjpeg_turbo/lib/")
+  INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../../depends/libjpeg_turbo/include/")
+  LINK_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../../depends/libjpeg_turbo/lib/")
 endif()
 
-SET(RESOURCES_INC_FILE "${MY_DIR}/src/resources.inc")
+SET(RESOURCES_INC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/resources.inc")
 
 SET(SOURCES
 
@@ -99,7 +135,8 @@ SET(LIBRARIES
   ${LibUSB_LIBRARIES}
   ${TJPEG_LIBRARY}
   ${LIBFREENECT2_THREADING_LIBRARIES}
-  ${GLEW_LIBRARY}
+  ${GLEW_LIBRARIES}
+  ${GLEWmx_LIBRARIES}
 )
 
 SET(RESOURCES
@@ -145,9 +182,9 @@ IF(ENABLE_OPENCL AND OPENCL_FOUND)
   )
 ENDIF(ENABLE_OPENCL AND OPENCL_FOUND)
 
-GENERATE_RESOURCES(${RESOURCES_INC_FILE} ${MY_DIR} ${RESOURCES})
+GENERATE_RESOURCES(${RESOURCES_INC_FILE} ${CMAKE_CURRENT_SOURCE_DIR} ${RESOURCES})
 
-INCLUDE_DIRECTORIES("${MY_DIR}/include")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 ADD_DEFINITIONS(-DRESOURCES_INC)
 ADD_LIBRARY(freenect2 SHARED ${SOURCES})
@@ -175,10 +212,10 @@ CONFIGURE_FILE(freenect2.cmake.in
 INSTALL(TARGETS 
   freenect2 DESTINATION lib)
 INSTALL(DIRECTORY 
-  "${MY_DIR}/include/" DESTINATION include)
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include)
 IF("${LIBFREENECT2_THREADING}" MATCHES "tinythread")
   INSTALL(FILES 
-    "${MY_DIR}/src/tinythread/tinythread.h" DESTINATION include/${PROJECT_NAME}/tinythread/)
+      "${CMAKE_CURRENT_SOURCE_DIR}/src/tinythread/tinythread.h" DESTINATION include/${PROJECT_NAME}/tinythread/)
 ENDIF("${LIBFREENECT2_THREADING}" MATCHES "tinythread")
 INSTALL(FILES 
   "${PROJECT_BINARY_DIR}/freenect2Config.cmake" DESTINATION lib/cmake/freenect2/)

examples/protonect/cmake_modules/FindGlew.cmake

@@ -5,7 +5,7 @@
 #
 # GLEW_FOUND
 # GLEW_INCLUDE_DIR
-# GLEW_LIBRARY
+# GLEW_LIBRARIES
 #
 
 include(FindPackageHandleStandardArgs)
@@ -19,15 +19,15 @@ if (WIN32)
             DOC "The directory where GL/glew.h resides" )
 
     if(ARCH STREQUAL "x86")
-      find_library( GLEW_LIBRARY
+      find_library( GLEW_LIBRARIES
           NAMES
               glew32mx glew32mxs
           PATHS
               "$ENV{GLEW_ROOT_DIR}/lib/Release MX/win32"
               "$ENV{GLEW_ROOT_DIR}/lib/Release MX/win32"
               DOC "The GLEW library")
     else()
-      find_library( GLEW_LIBRARY
+      find_library( GLEW_LIBRARIES
           NAMES
               glew32mx glew32mxs
           PATHS
@@ -48,7 +48,7 @@ else(WIN32)
             NO_DEFAULT_PATH
             DOC "The directory where GL/glew.h resides"
     )
-    find_library( GLEW_LIBRARY
+    find_library( GLEW_LIBRARIES
         NAMES
             GLEW glew
         PATHS
@@ -65,7 +65,7 @@ endif ()
 
 find_package_handle_standard_args(GLEW DEFAULT_MSG
     GLEW_INCLUDE_DIR
-    GLEW_LIBRARY
+    GLEW_LIBRARIES
 )
 
-mark_as_advanced( GLEW_FOUND )
+mark_as_advanced( GLEW_FOUND )

examples/protonect/cmake_modules/FindTurboJPEG.cmake

@@ -33,19 +33,8 @@ if(WIN32)
 		set(DEFAULT_TJPEG_LIBRARY c:\\libjpeg-turbo64\\lib\\turbojpeg.lib)
 	endif()
 else()
-	if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x32")
-		set(DEFAULT_TJPEG_LIBRARY /usr/lib/libturbojpeg.so)
-		
-		if(NOT EXISTS ${DEFAULT_TJPEG_LIBRARY})
-			set(DEFAULT_TJPEG_LIBRARY /opt/libjpeg-turbo/lib64/libturbojpeg.so)
-		endif()
-	else()
-		set(DEFAULT_TJPEG_LIBRARY /usr/lib/libturbojpeg.a)
-
-                if(NOT EXISTS ${DEFAULT_TJPEG_LIBRARY})
-                        set(DEFAULT_TJPEG_LIBRARY /opt/libjpeg-turbo/lib/libturbojpeg.a)
-                endif()
-	endif()
+    find_library(DEFAULT_TJPEG_LIBRARY NAMES libturbojpeg.so libturbojpeg.a
+        HINTS /opt/libjpeg-turbo/lib64/ /opt/libjpeg-turbo/lib/)
 endif()
 
 set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH
@@ -64,4 +53,4 @@ if(NOT TURBOJPEG_WORKS)
 	message(FATAL_ERROR "Could not link with TurboJPEG library ${TJPEG_LIBRARY}.  If it is installed in a different place, then set TJPEG_LIBRARY accordingly.")
 endif()
 
-message(STATUS "TJPEG_LIBRARY = ${TJPEG_LIBRARY}")
+message(STATUS "TJPEG_LIBRARY = ${TJPEG_LIBRARY}")