From cfb867f488c5c5ae3766c0699c7b1909d5daa2ca Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 30 Mar 2019 22:05:44 +0200
Subject: [PATCH] Fix for finding opencv viz in linux, although might break in
windows
---
cv-node/CMakeLists.txt | 2 +-
cv-node/cmake/FindLibSGM.cmake | 4 +---
cv-node/cmake/{FindGLOG.cmake => Findglog.cmake} | 4 +---
3 files changed, 3 insertions(+), 7 deletions(-)
rename cv-node/cmake/{FindGLOG.cmake => Findglog.cmake} (81%)
diff --git a/cv-node/CMakeLists.txt b/cv-node/CMakeLists.txt
index 3adda0857..e8ab4514b 100644
--- a/cv-node/CMakeLists.txt
+++ b/cv-node/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
include_directories(${PROJECT_BINARY_DIR})
# Check for optional opencv components
-set(CMAKE_REQUIRED_INCLUDES "${OpenCV_DIR}/include")
+set(CMAKE_REQUIRED_INCLUDES ${OpenCV_INCLUDE_DIRS})
check_include_file_cxx("opencv2/viz.hpp" HAVE_VIZ)
check_include_file_cxx("opencv2/cudastereo.hpp" HAVE_OPENCVCUDA)
diff --git a/cv-node/cmake/FindLibSGM.cmake b/cv-node/cmake/FindLibSGM.cmake
index 35ee75c25..37fe6ca92 100644
--- a/cv-node/cmake/FindLibSGM.cmake
+++ b/cv-node/cmake/FindLibSGM.cmake
@@ -31,13 +31,11 @@ find_path(LIBSGM_INCLUDE_DIRS
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LibSGM DEFAULT_MSG LIBSGM_LIBRARY LIBSGM_INCLUDE_DIRS)
-message(STATUS "(LIBSGM_FOUND : ${LIBSGM_FOUND} include: ${LIBSGM_INCLUDE_DIRS}, lib: ${LIBSGM_LIBRARY})")
-
mark_as_advanced(LIBSGM_FOUND)
if(LIBSGM_FOUND)
include_directories(${LIBSGM_INCLUDE_DIRS})
set(LIBSGM_FOUND TRUE CACHE BOOL "" FORCE)
set(LIBSGM_LIBRARIES ${LIBSGM_LIBRARY})
- message(STATUS "LibSGM found ( include: ${LIBSGM_INCLUDE_DIRS}, lib: ${LIBSGM_LIBRARY})")
+ message(STATUS "Found libSGM")
endif()
diff --git a/cv-node/cmake/FindGLOG.cmake b/cv-node/cmake/Findglog.cmake
similarity index 81%
rename from cv-node/cmake/FindGLOG.cmake
rename to cv-node/cmake/Findglog.cmake
index 3cf3a4a06..e4e0eea8c 100644
--- a/cv-node/cmake/FindGLOG.cmake
+++ b/cv-node/cmake/Findglog.cmake
@@ -27,13 +27,11 @@ find_path(GLOG_INCLUDE_DIRS
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(glog DEFAULT_MSG GLOG_LIBRARY GLOG_INCLUDE_DIRS)
-message(STATUS "(GLOG_FOUND : ${GLOG_FOUND} include: ${GLOG_INCLUDE_DIRS}, lib: ${GLOG_LIBRARY})")
-
mark_as_advanced(GLOG_FOUND)
if(GLOG_FOUND)
include_directories(${GLOG_INCLUDE_DIRS})
set(GLOG_FOUND TRUE CACHE BOOL "" FORCE)
set(GLOG_LIBRARIES ${GLOG_LIBRARY})
- message(STATUS "glog found ( include: ${GLOG_INCLUDE_DIRS}, lib: ${GLOG_LIBRARY})")
+ message(STATUS "Found glog)")
endif()
--
GitLab