Skip to content

Commit 5b6d4ae

Browse files
committed
Merge pull request #357 from goldhoorn/fix_libusb_find_script
Corrected handling of DEPENDS_DIR and extended description of it
2 parents efc5ee0 + f6a163b commit 5b6d4ae

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

examples/protonect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PROJECT(libfreenect2)
44
SET(CMAKE_BUILD_TYPE RelWithDebInfo)
55

66
SET(MY_DIR ${libfreenect2_SOURCE_DIR})
7-
SET(DEPENDS_DIR "${MY_DIR}/../../depends" CACHE STRING "dependency directory")
7+
SET(DEPENDS_DIR "${MY_DIR}/../../depends" CACHE STRING "dependency directory must be set to 'false' if external deps are used")
88

99
OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
1010
OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)

examples/protonect/cmake_modules/FindLibUSB.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# LibUSB_LIBRARIES: the libraries
99

1010
IF(PKG_CONFIG_FOUND)
11-
IF(${DEPENDS_DIR}) #Otherwise use System pkg-config path
11+
IF(DEPENDS_DIR) #Otherwise use System pkg-config path
1212
SET(ENV{PKG_CONFIG_PATH} "${DEPENDS_DIR}/libusb/lib/pkgconfig")
1313
ENDIF()
1414
IF(LibUSB_FIND_REQUIRED)

0 commit comments

Comments
 (0)