Merge pull request #274 from xlz/cmake

CMake cleanup

Author: floe

examples/protonect/CMakeLists.txt

@@ -1,20 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-macro(auto_detect_lib LIBNAME)
-  if ( PKG_CONFIG_FOUND )
-    string(TOLOWER ${LIBNAME} PKGCONFIGNAME)
-    pkg_check_modules(${LIBNAME} ${PKGCONFIGNAME} ${ARGN})
-  else(PKG_CONFIG_FOUND)
-    #MESSAGE("Fallback to non-pkg-config")
-    FIND_PACKAGE(${LIBNAME} ${ARGN})
-  endif(PKG_CONFIG_FOUND)
-endmacro()
-
 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(DEPENDS_DIR "${MY_DIR}/../../depends" CACHE STRING "dependency directory")
 
 OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
 OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)
@@ -48,24 +38,21 @@ SET(EXECUTABLE_OUTPUT_PATH ${MY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${MY_DIR}/lib)
 
 # dependencies
-find_package(PkgConfig)    # try find PKGConfig as it will be used if found
-auto_detect_lib(LibUSB-1.0 REQUIRED)
-auto_detect_lib(OpenCV REQUIRED)
+FIND_PACKAGE(PkgConfig)    # try find PKGConfig as it will be used if found
+FIND_PACKAGE(LibUSB REQUIRED)
+FIND_PACKAGE(OpenCV REQUIRED)
 FIND_PACKAGE(TurboJPEG REQUIRED) #does not provide a package-config file
 
-#hack for buggy libusb pkgconfig file
-if(NOT LibUSB_INCLUDE_DIR)
-  find_path(LibUSB_INCLUDE_DIR NAMES libusb.h PATHS /usr/include/libusb-1.0 )
-endif()
-
 # Add includes
-INCLUDE_DIRECTORIES("${MY_DIR}/include" ${LIBFREENECT2_THREADING_INCLUDE_DIR} ${OpenCV_INCLUDE_DIRS} ${LibUSB_INCLUDE_DIR} ${TurboJPEG_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+  "${MY_DIR}/include"
+  ${LIBFREENECT2_THREADING_INCLUDE_DIR}
+  ${OpenCV_INCLUDE_DIRS}
+  ${LibUSB_INCLUDE_DIRS}
+  ${TurboJPEG_INCLUDE_DIRS}
+)
 
-if(APPLE AND NOT ${TurboJPEG_FOUND})
-  # libjpeg-turbo
-  INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/libjpeg_turbo/include/")
-  LINK_DIRECTORIES("${MY_DIR}/../../depends/libjpeg_turbo/lib/")
-endif()
+LINK_DIRECTORIES(${LibUSB_LIBRARY_DIRS})
 
 SET(RESOURCES_INC_FILE "${MY_DIR}/src/resources.inc")
 
@@ -119,7 +106,7 @@ SET(LIBRARIES
   ${OpenCV_LIBS}
   ${OpenCV_LIBRARIES}
   ${LibUSB_LIBRARIES}
-  ${TurboJPEG_LIBRARY}
+  ${TurboJPEG_LIBRARIES}
   ${LIBFREENECT2_THREADING_LIBRARIES}
 )
 
@@ -130,34 +117,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 +141,7 @@ IF(ENABLE_OPENGL)
     src/shader/stage1.fs
     src/shader/stage2.fs
   )
+  ENDIF()
 ENDIF(ENABLE_OPENGL)
 
 IF(ENABLE_OPENCL)
@@ -195,7 +165,7 @@ IF(ENABLE_OPENCL)
   ENDIF(OPENCL_FOUND)
 ENDIF(ENABLE_OPENCL)
 
-SET(CMAKE_INSTALL_RPATH ${LibUSB-1.0_LIBDIR})
+SET(CMAKE_INSTALL_RPATH ${LibUSB_LIBDIR})
 
 CONFIGURE_FILE("${MY_DIR}/include/libfreenect2/config.h.in" "${MY_DIR}/include/libfreenect2/config.h" @ONLY)
 GENERATE_RESOURCES(${RESOURCES_INC_FILE} ${MY_DIR} ${RESOURCES})

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} "${DEPENDS_DIR}/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
+    "${DEPENDS_DIR}/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
+    "${DEPENDS_DIR}/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)

examples/protonect/cmake_modules/FindLibUSB.cmake

@@ -0,0 +1,41 @@
+# - Find libusb for portable USB support
+# 
+# If the LibUSB_ROOT environment variable
+# is defined, it will be used as base path.
+# The following standard variables get defined:
+#  LibUSB_FOUND:    true if LibUSB was found
+#  LibUSB_INCLUDE_DIR: the directory that contains the include file
+#  LibUSB_LIBRARIES:  the libraries
+
+IF(PKG_CONFIG_FOUND)
+  SET(ENV{PKG_CONFIG_PATH} "${DEPENDS_DIR}/libusb/lib/pkgconfig")
+  PKG_CHECK_MODULES(LibUSB libusb-1.0)
+  RETURN()
+ENDIF()
+
+FIND_PATH(LibUSB_INCLUDE_DIRS
+  NAMES libusb.h
+  PATHS
+    "${DEPENDS_DIR}/libusb/libusb" # libusb git tree
+    "${DEPENDS_DIR}/libusbx"
+    ENV LibUSB_ROOT
+  PATH_SUFFIXES
+    include
+)
+
+FIND_LIBRARY(LibUSB_LIBRARIES
+  NAMES libusb-1.0
+  PATHS
+    "${DEPENDS_DIR}/libusb"
+    "${DEPENDS_DIR}/libusbx"
+    ENV LibUSB_ROOT
+  PATH_SUFFIXES
+    x64/Release/dll
+    x64/Debug/dll
+    Win32/Release/dll
+    Win32/Debug/dll
+    MS64
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUSB DEFAULT_MSG LibUSB_LIBRARIES LibUSB_INCLUDE_DIRS)

examples/protonect/cmake_modules/FindLibUsb-1.0.cmake

@@ -1,26 +1,50 @@
-include(CheckCSourceCompiles)
+# FindTurboJPEG.cmake
+# Uses environment variable TurboJPEG_ROOT as backup
+# - TurboJPEG_FOUND
+# - TurboJPEG_INCLUDE_DIRS
+# - TurboJPEG_LIBRARIES
 
-find_path(TurboJPEG_INCLUDE_DIR turbojpeg.h DOC "Found TurboJPEG include directory)" PATHS "${CMAKE_SOURCE_DIR}/../../depends/libjpeg_turbo/include" "C:/libjpeg-turbo64/include" "/opt/libjpeg-turbo/include" "$ENV{TurboJPEG_ROOT}/include")
+FIND_PATH(TurboJPEG_INCLUDE_DIRS
+  turbojpeg.h
+  DOC "Found TurboJPEG include directory"
+  PATHS
+    "${DEPENDS_DIR}/libjpeg_turbo"
+    "${DEPENDS_DIR}/libjpeg-turbo64"
+    "/usr/local/opt/jpeg-turbo" # homebrew
+    "/opt/local" # macports
+    "C:/libjpeg-turbo64"
+    "/opt/libjpeg-turbo"
+    ENV TurboJPEG_ROOT
+  PATH_SUFFIXES
+    include
+)
 
-if(TurboJPEG_INCLUDE_DIR STREQUAL "TurboJPEG_INCLUDE_DIR-NOTFOUND")
-  message(FATAL_ERROR "Could not find turbojpeg.h - Try define TurboJPEG_ROOT as a system variable.")
-else()
-  message(STATUS "TurboJPEG_INCLUDE_DIR = ${TurboJPEG_INCLUDE_DIR}")
-endif()
-
-find_library(TurboJPEG_LIBRARY NAMES turbojpeg.lib libturbojpeg.so libturbojpeg.so.0 libturbojpeg.a DOC "Found TurboJPEG library path" PATHS "${CMAKE_SOURCE_DIR}/../../depends/libjpeg_turbo/lib" "C:/libjpeg-turbo64/lib" "$ENV{TurboJPEG_ROOT}/lib" "/opt/libjpeg-turbo/lib64" "/opt/libjpeg-turbo/lib")
+FIND_LIBRARY(TurboJPEG_LIBRARIES
+  NAMES libturbojpeg.so.0 turbojpeg
+  DOC "Found TurboJPEG library path"
+  PATHS
+    "${DEPENDS_DIR}/libjpeg_turbo"
+    "${DEPENDS_DIR}/libjpeg-turbo64"
+    "/usr/local/opt/jpeg-turbo" # homebrew
+    "/opt/local" # macports
+    "C:/libjpeg-turbo64"
+    "/opt/libjpeg-turbo"
+    ENV TurboJPEG_ROOT
+  PATH_SUFFIXES
+    lib
+    lib64
+)
 
-if(WIN32)
+INCLUDE(CheckCSourceCompiles)
+if(MSVC)
   set(CMAKE_REQUIRED_DEFINITIONS -MT)
 endif()
-set(CMAKE_REQUIRED_INCLUDES ${TurboJPEG_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES ${TurboJPEG_LIBRARY})
+set(CMAKE_REQUIRED_INCLUDES ${TurboJPEG_INCLUDE_DIRS})
+set(CMAKE_REQUIRED_LIBRARIES ${TurboJPEG_LIBRARIES})
 check_c_source_compiles("#include <turbojpeg.h>\nint main(void) { tjhandle h=tjInitCompress(); return 0; }" TURBOJPEG_WORKS)
 set(CMAKE_REQUIRED_DEFINITIONS)
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
-if(NOT TURBOJPEG_WORKS)
-  message(FATAL_ERROR "Could not link with TurboJPEG library ${TurboJPEG_LIBRARY}.  If it is installed in a different place, then set TurboJPEG_LIBRARY accordingly.")
-endif()
 
-message(STATUS "TurboJPEG_LIBRARY = ${TurboJPEG_LIBRARY}")
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TurboJPEG DEFAULT_MSG TurboJPEG_LIBRARIES TurboJPEG_INCLUDE_DIRS TURBOJPEG_WORKS)