Merge branch 'feature/openvr-windows' into 'master'

feature/openvr windows

See merge request nicolas.pope/ftl!260

.gitlab-ci.yml

@@ -6,7 +6,7 @@
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  CMAKE_ARGS_WINDOWS: '-DCMAKE_GENERATOR_PLATFORM=x64 -DPORTAUDIO_DIR="D:/Build/portaudio" -DNVPIPE_DIR="D:/Build/NvPipe" -DEigen3_DIR="C:/Program Files (x86)/Eigen3/share/eigen3/cmake" -DOpenCV_DIR="D:/Build/opencv-4.1.1" -DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.1"'
+  CMAKE_ARGS_WINDOWS: '-DCMAKE_GENERATOR_PLATFORM=x64 -DPORTAUDIO_DIR="D:/Build/portaudio" -DNVPIPE_DIR="D:/Build/NvPipe" -DEigen3_DIR="C:/Program Files (x86)/Eigen3/share/eigen3/cmake" -DOpenCV_DIR="D:/Build/opencv-4.1.1" -DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.1" -DWITH_OPENVR=TRUE -DOPENVR_DIR="D:/Build/OpenVRSDK"'
 
 stages:
  - all

CMakeLists.txt

@@ -65,20 +65,51 @@ endif()
 #	set(HAVE_LIBARCHIVE true)
 #endif()
 
-if (WITH_OPENVR)
+#if (WITH_OPENVR)
 	## OpenVR API path
-	find_library(OPENVR_LIBRARIES
-		NAMES
-			openvr_api
-	)
-	set(OPENVR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../headers)
+#	find_library(OPENVR_LIBRARIES
+#		NAMES
+#			openvr_api
+#	)
+#	set(OPENVR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../headers)
+#
+#	if (OPENVR_LIBRARIES)
+#		message(STATUS "Found OpenVR: ${OPENVR_LIBRARIES}")
+#		set(HAVE_OPENVR true)
+#	endif()
+#endif()
+
+# ============== OPEN VR =======================================================
+
+if (WITH_OPENVR)
+	find_library( OPENVR_LIBRARY NAMES openvr_api libopenvr_api openvr_api64 PATHS ${OPENVR_DIR} PATH_SUFFIXES lib)
+	if (OPENVR_LIBRARY)
+		set(HAVE_OPENVR TRUE)
+		add_library(openvr UNKNOWN IMPORTED)
+		#set_property(TARGET nanogui PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NANOGUI_EXTRA_INCS})
+		set_property(TARGET openvr PROPERTY IMPORTED_LOCATION ${OPENVR_LIBRARY})
+		message(STATUS "Found OpenVR: ${OPENVR_LIBRARY}")
 
-	if (OPENVR_LIBRARIES)
-		message(STATUS "Found OpenVR: ${OPENVR_LIBRARIES}")
-		set(HAVE_OPENVR true)
+		if(WIN32)
+			# Find include
+			find_path(OPENVR_INCLUDE_DIRS
+				NAMES openvr/openvr.h
+				PATHS "C:/Program Files/OpenVRSDK" "C:/Program Files (x86)/OpenVRSDK" ${OPENVR_DIR}
+				PATH_SUFFIXES include
+			)
+			set_property(TARGET openvr PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${OPENVR_INCLUDE_DIRS})
 		endif()
+	else()
+		set(OPENVR_LIBRARY "")
+		add_library(openvr INTERFACE)
+	endif()
+else()
+	set(OPENVR_LIBRARY "")
+	add_library(openvr INTERFACE)
 endif()
 
+# ==============================================================================
+
 if (WITH_FIXSTARS)
 	find_package( LibSGM )
 	if (LibSGM_FOUND)

applications/gui/CMakeLists.txt

@@ -40,6 +40,6 @@ target_include_directories(ftl-gui PUBLIC
 #endif()
 
 #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(ftl-gui ftlcommon ftlctrl ftlrgbd ftlstreams ftlrender Threads::Threads ${OpenCV_LIBS} ${OPENVR_LIBRARIES} glog::glog ftlnet nanogui ${NANOGUI_EXTRA_LIBS})
+target_link_libraries(ftl-gui ftlcommon ftlctrl ftlrgbd ftlstreams ftlrender Threads::Threads ${OpenCV_LIBS} openvr ftlnet nanogui ${NANOGUI_EXTRA_LIBS})