From a841f0baafa3db69657fd7d4e29b7d2144eb091a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 Apr 2015 11:33:17 -0700 Subject: [PATCH 1/2] install OpenCV headers when using local OpenCV --- CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f1cd3d3..90827257 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,9 +135,14 @@ if (PSMOVE_USE_LOCAL_OPENCV) set(OPENCV_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/opencv) link_directories(${OPENCV_SRC_DIR}/build/lib) link_directories(${OPENCV_SRC_DIR}/build/3rdparty/lib) - include_directories(${OPENCV_SRC_DIR}/modules/core/include) - include_directories(${OPENCV_SRC_DIR}/modules/imgproc/include) - include_directories(${OPENCV_SRC_DIR}/modules/highgui/include) + + foreach(OPENCV_MODULE core imgproc highgui) + include_directories(${OPENCV_SRC_DIR}/modules/${OPENCV_MODULE}/include) + + # install the required OpenCV headers + install(FILES ${OPENCV_SRC_DIR}/modules/${OPENCV_MODULE}/include DESTINATION include) + endforeach() + set(PSMOVE_BUILD_TRACKER ON) set(INFO_BUILD_TRACKER "Yes (with local OpenCV)") From b5d23863277923f7fa954410acab6fe4a6699639 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 Apr 2015 14:29:13 -0700 Subject: [PATCH 2/2] use DIRECTORY for install of open cv headers --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90827257..0fc860fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,7 @@ if (PSMOVE_USE_LOCAL_OPENCV) include_directories(${OPENCV_SRC_DIR}/modules/${OPENCV_MODULE}/include) # install the required OpenCV headers - install(FILES ${OPENCV_SRC_DIR}/modules/${OPENCV_MODULE}/include DESTINATION include) + install(DIRECTORY ${OPENCV_SRC_DIR}/modules/${OPENCV_MODULE}/include/opencv2 DESTINATION include) endforeach() set(PSMOVE_BUILD_TRACKER ON)