Corrected indention.

Removed Lib found announcement.
Removed lib was already known.

Author: larshg

examples/protonect/CMakeLists.txt

@@ -1,20 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 macro(auto_detect_lib LIBNAME)
-    if(NOT DEFINED ${${LIBNAME}_FOUND})
-        if ( PKG_CONFIG_FOUND )
-            string(TOLOWER ${LIBNAME} PKGCONFIGNAME)
-            pkg_check_modules(${LIBNAME} ${PKGCONFIGNAME} ${ARGN})
-            if(${${LIBNAME}_FOUND})
-                MESSAGE(STATUS "LIB ${LIBNAME} found and include is in ${${LIBNAME}_INCLUDE_DIRS}")
-            endif()
-        else(PKG_CONFIG_FOUND)
-            #MESSAGE("Fallback to non-pkg-config")
-            FIND_PACKAGE(${LIBNAME} ${ARGN})
-        endif(PKG_CONFIG_FOUND)
-    else()
-        MESSAGE(STATUS "LIB was already known ${LIBNAME} becasue of ${${LIBNAME}_FOUND}")
-    endif()
+  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)
@@ -31,9 +24,9 @@ IF(ENABLE_CXX11)
   CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
   CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
   IF(COMPILER_SUPPORTS_CXX11)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   ELSEIF(COMPILER_SUPPORTS_CXX0X)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
   ELSE()
     MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
   ENDIF()
@@ -54,17 +47,14 @@ 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
+find_package(PkgConfig)    # try find PKGConfig as it will be used if found
 auto_detect_lib(LibUSB REQUIRED)
 auto_detect_lib(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 
-    )
+  find_path(LibUSB_INCLUDE_DIR NAMES libusb.h PATHS /usr/include/libusb-1.0 )
 endif()
 
 # Add includes
@@ -138,14 +128,13 @@ SET(RESOURCES
   zTable.bin
 )
 
-
 IF(ENABLE_OPENGL)
   auto_detect_lib(GLFW3)
 
   #Assuming local build witout global deps, ugly to to this automatic but to keep backward compatibiliy
   if(${GLFW3_FOUND} STREQUAL "FALSE")
 
-	MESSAGE(STATUS "Building local GLFW")
+    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")
@@ -154,11 +143,11 @@ IF(ENABLE_OPENGL)
 
     ADD_SUBDIRECTORY(${MY_DIR}/../../depends/glfw_src/ ${MY_DIR}/../../depends/glfw)
     INCLUDE_DIRECTORIES(${MY_DIR}/../../depends/glfw_src/include/)
-	
-	LIST(APPEND LIBRARIES
-    glfw
-	)
-	
+    
+    LIST(APPEND LIBRARIES
+      glfw
+    )
+    
   else()
     INCLUDE_DIRECTORIES(${GLFW3_INCLUDE_DIRS})
 
@@ -187,21 +176,21 @@ ENDIF(ENABLE_OPENGL)
 IF(ENABLE_OPENCL)
   FIND_PACKAGE(OpenCL)
 
-  IF(OPENCL_FOUND)	  
-	  SET(LIBFREENECT2_WITH_OPENCL_SUPPORT 1)
-	  INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIRS})
-	  
-	  LIST(APPEND SOURCES
-		src/opencl_depth_packet_processor.cpp
-	  )
-
-	  LIST(APPEND LIBRARIES
-		${OPENCL_LIBRARIES}
-	  )
-	  
-	  LIST(APPEND RESOURCES
-		src/opencl_depth_packet_processor.cl
-	  )
+  IF(OPENCL_FOUND)      
+    SET(LIBFREENECT2_WITH_OPENCL_SUPPORT 1)
+    INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIRS})
+    
+    LIST(APPEND SOURCES
+      src/opencl_depth_packet_processor.cpp
+    )
+
+    LIST(APPEND LIBRARIES
+      ${OPENCL_LIBRARIES}
+    )
+      
+    LIST(APPEND RESOURCES
+      src/opencl_depth_packet_processor.cl
+    )
   ENDIF(OPENCL_FOUND)
 ENDIF(ENABLE_OPENCL)
 

examples/protonect/cmake_modules/FindGLFW3.cmake

@@ -8,10 +8,9 @@
 include(FindPackageHandleStandardArgs)
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-	find_path(GLFW3_INCLUDE_DIRS glfw/glfw3.h DOC "GLFW include directory " HINTS $ENV{GLFW_ROOT}/include)
-	
-	find_library(GLFW3_LIBRARIES NAMES glfw3dll.lib HINTS $ENV{GLFW_ROOT}/lib/)
-	
+  find_path(GLFW3_INCLUDE_DIRS glfw/glfw3.h DOC "GLFW include directory " HINTS $ENV{GLFW_ROOT}/include)
+  
+  find_library(GLFW3_LIBRARIES NAMES glfw3dll.lib HINTS $ENV{GLFW_ROOT}/lib/)
 ENDIF()
 
 find_package_handle_standard_args(GLFW3 "Could not find GLFW3 - try adding GLFW_ROOT in enviroment variables." GLFW3_INCLUDE_DIRS GLFW3_LIBRARIES)

examples/protonect/cmake_modules/FindLibUsb.cmake

@@ -7,21 +7,21 @@
 # it on its own. If the LibUSB_ROOT_DIR 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_FOUND:    true if LibUSB was found
 #  LibUSB_INCLUDE_DIR: the directory that contains the include file
-#  LibUSB_LIBRARIES:    the library
+#  LibUSB_LIBRARIES:  the library
 
 include ( CheckLibraryExists )
 include ( CheckIncludeFile )
 
 find_path ( LibUSB_INCLUDE_DIR
-    NAMES
-      libusb.h
-    PATHS
-      $ENV{ProgramFiles}/LibUSB-Win32
-      $ENV{LibUSB_ROOT_DIR}
-    PATH_SUFFIXES
-      libusb
+  NAMES
+    libusb.h
+  PATHS
+    $ENV{ProgramFiles}/LibUSB-Win32
+    $ENV{LibUSB_ROOT_DIR}
+  PATH_SUFFIXES
+    libusb
   )
 
 mark_as_advanced ( LibUSB_INCLUDE_DIR )
@@ -30,40 +30,40 @@ if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
   # LibUSB-Win32 binary distribution contains several libs.
   # Use the lib that got compiled with the same compiler.
   if ( MSVC )
-    if ( ${CMAKE_SIZEOF_VOID_P} EQUAL 8 )
-      set ( LibUSB_LIBRARY_PATH_SUFFIX_RELEASE x64/Release/dll )
-      set ( LibUSB_LIBRARY_PATH_SUFFIX_DEBUG x64/Debug/dll )
-    else ()
-      set ( LibUSB_LIBRARY_PATH_SUFFIX_RELEASE win32/Release/dll )
-      set ( LibUSB_LIBRARY_PATH_SUFFIX_DEBUG win32/Debug/dll )
-    endif ()          
+  if ( ${CMAKE_SIZEOF_VOID_P} EQUAL 8 )
+    set ( LibUSB_LIBRARY_PATH_SUFFIX_RELEASE x64/Release/dll )
+    set ( LibUSB_LIBRARY_PATH_SUFFIX_DEBUG x64/Debug/dll )
+  else ()
+    set ( LibUSB_LIBRARY_PATH_SUFFIX_RELEASE win32/Release/dll )
+    set ( LibUSB_LIBRARY_PATH_SUFFIX_DEBUG win32/Debug/dll )
+  endif ()      
   endif ( MSVC )
 endif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
 
 find_library ( LibUSB_LIBRARY_RELEASE
-    NAMES
-      libusb libusb-1.0 usb
-    PATHS
-      $ENV{ProgramFiles}/LibUSB-Win32
-      $ENV{LibUSB_ROOT_DIR}
-    PATH_SUFFIXES
-      ${LibUSB_LIBRARY_PATH_SUFFIX_RELEASE}
+  NAMES
+    libusb libusb-1.0 usb
+  PATHS
+    $ENV{ProgramFiles}/LibUSB-Win32
+    $ENV{LibUSB_ROOT_DIR}
+  PATH_SUFFIXES
+    ${LibUSB_LIBRARY_PATH_SUFFIX_RELEASE}
   )
 
 find_library ( LibUSB_LIBRARY_DEBUG
-    NAMES
-      libusb libusb-1.0 libusb-1.0d usb
-    PATHS
-      $ENV{ProgramFiles}/LibUSB-Win32
-      $ENV{LibUSB_ROOT_DIR}
-    PATH_SUFFIXES
-      ${LibUSB_LIBRARY_PATH_SUFFIX_DEBUG}
+  NAMES
+    libusb libusb-1.0 libusb-1.0d usb
+  PATHS
+    $ENV{ProgramFiles}/LibUSB-Win32
+    $ENV{LibUSB_ROOT_DIR}
+  PATH_SUFFIXES
+    ${LibUSB_LIBRARY_PATH_SUFFIX_DEBUG}
   )  
 
 set (LibUSB_LIBRARIES
-	debug ${LibUSB_LIBRARY_DEBUG}
-	optimized ${LibUSB_LIBRARY_RELEASE}
-	)
+  debug ${LibUSB_LIBRARY_DEBUG}
+  optimized ${LibUSB_LIBRARY_RELEASE}
+  )
 
 if ( LibUSB_INCLUDE_DIR AND LibUSB_LIBRARIES )
   set ( LibUSB_FOUND 1 )
@@ -80,9 +80,9 @@ endif ( LibUSB_FOUND )
 
 if ( NOT LibUSB_FOUND )
   if ( NOT LibUSB_FIND_QUIETLY )
-    message ( STATUS "LibUSB not found, try setting LibUSB_ROOT_DIR environment variable." )
+  message ( STATUS "LibUSB not found, try setting LibUSB_ROOT_DIR environment variable." )
   endif ( NOT LibUSB_FIND_QUIETLY )
   if ( LibUSB_FIND_REQUIRED )
-    message ( FATAL_ERROR "LibUSB could not be found." )
+  message ( FATAL_ERROR "LibUSB could not be found." )
   endif ( LibUSB_FIND_REQUIRED )
 endif ( NOT LibUSB_FOUND )

examples/protonect/cmake_modules/FindTurboJPEG.cmake

@@ -1,36 +1,36 @@
 include(CheckCSourceCompiles)
 
 if(NOT TurboJPEG_INCLUDE_DIR)
-	if(WIN32)
-		if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-			set(DEFAULT_TurboJPEG_INCLUDE_DIR $ENV{TurboJPEG64_ROOT}/include)
-		else()
-			set(DEFAULT_TurboJPEG_INCLUDE_DIR $ENV{TurboJPEG_ROOT}/include)
-		endif()
-	else()
-		set(DEFAULT_TurboJPEG_INCLUDE_DIR /opt/libjpeg-turbo/include)
-	endif()
+  if(WIN32)
+    if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+      set(DEFAULT_TurboJPEG_INCLUDE_DIR $ENV{TurboJPEG64_ROOT}/include)
+    else()
+      set(DEFAULT_TurboJPEG_INCLUDE_DIR $ENV{TurboJPEG_ROOT}/include)
+    endif()
+  else()
+    set(DEFAULT_TurboJPEG_INCLUDE_DIR /opt/libjpeg-turbo/include)
+  endif()
 else()
-	set(DEFAULT_TurboJPEG_INCLUDE_DIR ${TurboJPEG_INCLUDE_DIR})
-	unset(TurboJPEG_INCLUDE_DIR)
-	unset(TurboJPEG_INCLUDE_DIR CACHE)
+  set(DEFAULT_TurboJPEG_INCLUDE_DIR ${TurboJPEG_INCLUDE_DIR})
+  unset(TurboJPEG_INCLUDE_DIR)
+  unset(TurboJPEG_INCLUDE_DIR CACHE)
 endif()
 
 find_path(TurboJPEG_INCLUDE_DIR turbojpeg.h DOC "TurboJPEG include directory (default: ${DEFAULT_TurboJPEG_INCLUDE_DIR})" HINTS ${DEFAULT_TurboJPEG_INCLUDE_DIR})
 
 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.")
+  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}")
+  message(STATUS "TurboJPEG_INCLUDE_DIR = ${TurboJPEG_INCLUDE_DIR}")
 endif()
 
 
 if(WIN32)
-	if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-		set(DEFAULT_TurboJPEG_LIBRARY $ENV{TurboJPEG64_ROOT}/lib/turbojpeg.lib)
-	else()
-		set(DEFAULT_TurboJPEG_LIBRARY $ENV{TurboJPEG_ROOT}/lib/turbojpeg.lib)
-	endif()
+  if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+    set(DEFAULT_TurboJPEG_LIBRARY $ENV{TurboJPEG64_ROOT}/lib/turbojpeg.lib)
+  else()
+    set(DEFAULT_TurboJPEG_LIBRARY $ENV{TurboJPEG_ROOT}/lib/turbojpeg.lib)
+  endif()
 else()
     find_library(DEFAULT_TurboJPEG_LIBRARY NAMES libturbojpeg.so libturbojpeg.a
         HINTS /opt/libjpeg-turbo/lib64/ /opt/libjpeg-turbo/lib/)
@@ -40,7 +40,7 @@ set(TurboJPEG_LIBRARY ${DEFAULT_TurboJPEG_LIBRARY} CACHE PATH
   "TurboJPEG library path (default: ${DEFAULT_TurboJPEG_LIBRARY})")
 
 if(WIN32)
-	set(CMAKE_REQUIRED_DEFINITIONS -MT)
+  set(CMAKE_REQUIRED_DEFINITIONS -MT)
 endif()
 set(CMAKE_REQUIRED_INCLUDES ${TurboJPEG_INCLUDE_DIR})
 set(CMAKE_REQUIRED_LIBRARIES ${TurboJPEG_LIBRARY})
@@ -49,7 +49,7 @@ 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.")
+  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}")