Skip to content

Commit 429e42c

Browse files
committed
Use DEPENDS_DIR to simplify paths
1 parent 5e2a6cc commit 429e42c

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

examples/protonect/CMakeLists.txt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
22

3-
macro(auto_detect_lib LIBNAME)
4-
if ( PKG_CONFIG_FOUND )
5-
string(TOLOWER ${LIBNAME} PKGCONFIGNAME)
6-
pkg_check_modules(${LIBNAME} ${PKGCONFIGNAME} ${ARGN})
7-
else(PKG_CONFIG_FOUND)
8-
#MESSAGE("Fallback to non-pkg-config")
9-
FIND_PACKAGE(${LIBNAME} ${ARGN})
10-
endif(PKG_CONFIG_FOUND)
11-
endmacro()
12-
133
PROJECT(libfreenect2)
144
SET(CMAKE_BUILD_TYPE RelWithDebInfo)
155

166
SET(MY_DIR ${libfreenect2_SOURCE_DIR})
7+
SET(DEPENDS_DIR "${MY_DIR}/../../depends" CACHE STRING "dependency directory")
178

189
OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
1910
OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)
@@ -47,7 +38,7 @@ SET(EXECUTABLE_OUTPUT_PATH ${MY_DIR}/bin)
4738
SET(LIBRARY_OUTPUT_PATH ${MY_DIR}/lib)
4839

4940
# dependencies
50-
find_package(PkgConfig) # try find PKGConfig as it will be used if found
41+
FIND_PACKAGE(PkgConfig) # try find PKGConfig as it will be used if found
5142
FIND_PACKAGE(LibUSB REQUIRED)
5243
FIND_PACKAGE(OpenCV REQUIRED)
5344
FIND_PACKAGE(TurboJPEG REQUIRED) #does not provide a package-config file

examples/protonect/cmake_modules/FindGLFW3.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ IF(PKG_CONFIG_FOUND)
1111
# homebrew or macports pkgconfig locations
1212
SET(ENV{PKG_CONFIG_PATH} "/usr/local/opt/glfw3/lib/pkgconfig:/opt/local/lib/pkgconfig")
1313
ENDIF()
14-
SET(ENV{PKG_CONFIG_PATH} "${CMAKE_SOURCE_DIR}/../../depends/glfw/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
14+
SET(ENV{PKG_CONFIG_PATH} "${DEPENDS_DIR}/glfw/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
1515
PKG_CHECK_MODULES(GLFW3 glfw3)
1616

1717
RETURN()
@@ -21,7 +21,7 @@ FIND_PATH(GLFW3_INCLUDE_DIRS
2121
GLFW/glfw3.h
2222
DOC "GLFW include directory "
2323
PATHS
24-
"${CMAKE_SOURCE_DIR}/../../depends/glfw"
24+
"${DEPENDS_DIR}/glfw"
2525
"$ENV{ProgramW6432}/glfw"
2626
ENV GLFW_ROOT
2727
PATH_SUFFIXES
@@ -40,7 +40,7 @@ ENDIF()
4040
FIND_LIBRARY(GLFW3_LIBRARIES
4141
NAMES glfw3dll glfw3
4242
PATHS
43-
"${CMAKE_SOURCE_DIR}/../../depends/glfw"
43+
"${DEPENDS_DIR}/glfw"
4444
"$ENV{ProgramW6432}/glfw"
4545
ENV GLFW_ROOT
4646
PATH_SUFFIXES

examples/protonect/cmake_modules/FindLibUSB.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
# LibUSB_LIBRARIES: the libraries
99

1010
IF(PKG_CONFIG_FOUND)
11-
SET(ENV{PKG_CONFIG_PATH} "${CMAKE_SOURCE_DIR}/../../depends/libusb/lib/pkgconfig")
11+
SET(ENV{PKG_CONFIG_PATH} "${DEPENDS_DIR}/libusb/lib/pkgconfig")
1212
PKG_CHECK_MODULES(LibUSB libusb-1.0)
1313
RETURN()
1414
ENDIF()
1515

1616
FIND_PATH(LibUSB_INCLUDE_DIRS
1717
NAMES libusb.h
1818
PATHS
19-
${CMAKE_SOURCE_DIR}/../../depends/libusb
20-
${CMAKE_SOURCE_DIR}/../../depends/libusbx
19+
"${DEPENDS_DIR}/libusb"
20+
"${DEPENDS_DIR}/libusbx"
2121
ENV LibUSB_ROOT
2222
PATH_SUFFIXES
2323
include

examples/protonect/cmake_modules/FindTurboJPEG.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FIND_PATH(TurboJPEG_INCLUDE_DIRS
88
turbojpeg.h
99
DOC "Found TurboJPEG include directory"
1010
PATHS
11-
"${CMAKE_SOURCE_DIR}/../../depends/libjpeg_turbo"
12-
"${CMAKE_SOURCE_DIR}/../../depends/libjpeg-turbo64"
11+
"${DEPENDS_DIR}/libjpeg_turbo"
12+
"${DEPENDS_DIR}/libjpeg-turbo64"
1313
"/usr/local/opt/jpeg-turbo" # homebrew
1414
"/opt/local" # macports
1515
"C:/libjpeg-turbo64"
@@ -23,8 +23,8 @@ FIND_LIBRARY(TurboJPEG_LIBRARIES
2323
NAMES libturbojpeg.so.0 turbojpeg
2424
DOC "Found TurboJPEG library path"
2525
PATHS
26-
"${CMAKE_SOURCE_DIR}/../../depends/libjpeg_turbo"
27-
"${CMAKE_SOURCE_DIR}/../../depends/libjpeg-turbo64"
26+
"${DEPENDS_DIR}/libjpeg_turbo"
27+
"${DEPENDS_DIR}/libjpeg-turbo64"
2828
"/usr/local/opt/jpeg-turbo" # homebrew
2929
"/opt/local" # macports
3030
"C:/libjpeg-turbo64"

0 commit comments

Comments
 (0)