From 3a5f802e11639ff01e68815859701fbb683f8dc8 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 31 Jan 2020 14:30:27 +0200
Subject: [PATCH] Attempt realsense on windows
---
.gitlab-ci.yml | 2 +-
CMakeLists.txt | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d371af7b..2110e14be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ webserver-deploy:
- mkdir build
- cd build
- echo cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
- - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
+ - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
- devenv ftl.utu.fi.sln /build Release
- rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
- mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f6d5b6d5..1991d5345 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,13 +92,23 @@ else()
endif()
endif()
-find_library( REALSENSE_LIBRARY NAMES realsense2 librealsense2)
+find_library( REALSENSE_LIBRARY NAMES realsense2 librealsense2 PATHS ${REALSENSE_DIR} PATH_SUFFIXES lib/x64)
if (REALSENSE_LIBRARY)
set(HAVE_REALSENSE TRUE)
add_library(realsense UNKNOWN IMPORTED)
#set_property(TARGET nanogui PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NANOGUI_EXTRA_INCS})
set_property(TARGET realsense PROPERTY IMPORTED_LOCATION ${REALSENSE_LIBRARY})
- message(STATUS "Found Realsense SDK: ${REALSENSE_LIBRARY}")
+ message(STATUS "Found Realsense SDK: ${REALSENSE_LIBRARY}")
+
+ if(WIN32)
+ # Find include
+ find_path(REALSENSE_INCLUDE_DIRS
+ NAMES librealsense2/rs.hpp
+ PATHS "C:/Program Files/Intel RealSense SDK 2.0" "C:/Program Files (x86)/Intel RealSense SDK 2.0" ${REALSENSE_DIR}
+ PATH_SUFFIXES include
+ )
+ set_property(TARGET realsense PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${REALSENSE_INCLUDE_DIRS})
+ endif()
else()
set(REALSENSE_LIBRARY "")
endif()
--
GitLab