Fix coding style in FindTurboJPEG.cmake

Author: xlz

examples/protonect/CMakeLists.txt

@@ -58,7 +58,7 @@ INCLUDE_DIRECTORIES(
   ${LIBFREENECT2_THREADING_INCLUDE_DIR}
   ${OpenCV_INCLUDE_DIRS}
   ${LibUSB_INCLUDE_DIRS}
-  ${TurboJPEG_INCLUDE_DIR}
+  ${TurboJPEG_INCLUDE_DIRS}
 )
 
 LINK_DIRECTORIES(${LibUSB_LIBRARY_DIRS})
@@ -121,7 +121,7 @@ SET(LIBRARIES
   ${OpenCV_LIBS}
   ${OpenCV_LIBRARIES}
   ${LibUSB_LIBRARIES}
-  ${TurboJPEG_LIBRARY}
+  ${TurboJPEG_LIBRARIES}
   ${LIBFREENECT2_THREADING_LIBRARIES}
 )
 

examples/protonect/cmake_modules/FindTurboJPEG.cmake

@@ -1,26 +1,40 @@
-include(CheckCSourceCompiles)
+# FindTurboJPEG.cmake
+# - 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")
+INCLUDE(CheckCSourceCompiles)
 
-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_PATH(TurboJPEG_INCLUDE_DIRS
+  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_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 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"
+)
 
-if(WIN32)
+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)