Skip to content

Commit 8e0a6c8

Browse files
committed
Merge pull request #260 from larshg/findturbojpegfixes
Missing include and lib for default path on windows.
2 parents 1ef08ee + 33f2678 commit 8e0a6c8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

examples/protonect/cmake_modules/FindTurboJPEG.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
include(CheckCSourceCompiles)
22

3-
find_path(TurboJPEG_INCLUDE_DIR turbojpeg.h DOC "Found TurboJPEG include directory)" PATHS "${CMAKE_SOURCE_DIR}/../../depends/libjpeg_turbo" "C:/libjpeg-turbo64" "/opt/libjpeg-turbo/include" "$ENV{TurboJPEG_ROOT}/include")
3+
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")
44

55
if(TurboJPEG_INCLUDE_DIR STREQUAL "TurboJPEG_INCLUDE_DIR-NOTFOUND")
66
message(FATAL_ERROR "Could not find turbojpeg.h - Try define TurboJPEG_ROOT as a system variable.")
77
else()
88
message(STATUS "TurboJPEG_INCLUDE_DIR = ${TurboJPEG_INCLUDE_DIR}")
99
endif()
1010

11-
find_library(TurboJPEG_LIBRARY NAMES turbojpeg.lib libturbojpeg.so libturbojpeg.a DOC "Found TurboJPEG library path" PATHS "${CMAKE_SOURCE_DIR}/../../depends/libjpeg_turbo" "C:/libjpeg-turbo64/" "$ENV{TurboJPEG_ROOT}/lib" "/opt/libjpeg-turbo/lib64" "/opt/libjpeg-turbo/lib")
11+
find_library(TurboJPEG_LIBRARY NAMES turbojpeg.lib libturbojpeg.so 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")
1212

1313
if(WIN32)
1414
set(CMAKE_REQUIRED_DEFINITIONS -MT)

0 commit comments

Comments
 (0)