From d8fcaae3a035fe7468becea788002955e0234c88 Mon Sep 17 00:00:00 2001
From: Ansgar Philippsen <ansgar.philippsen@gmail.com>
Date: Fri, 29 Jun 2012 17:24:09 -0400
Subject: [PATCH] tweaks to spacenav build
---
CMakeLists.txt | 5 ++++-
modules/gui/src/CMakeLists.txt | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 059cda055..6a95e351a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,6 +240,9 @@ endif()
if (ENABLE_SPNAV)
find_package(SpNav REQUIRED)
+ set(_SPNAV ON)
+else()
+ set(_SPNAV OFF)
endif()
if (CMAKE_COMPILER_IS_GNUCXX)
@@ -252,7 +255,6 @@ include_directories(${Boost_INCLUDE_DIRS}
${FFTW_INCLUDE_PATH}
${EIGEN2_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
- ${SPNAV_INCLUDE_DIR}
${PNG_INCLUDE_DIR}
)
if(USE_NUMPY)
@@ -300,6 +302,7 @@ message(STATUS
" Image Processing support (-DENABLE_IMG) : ${_IMG}\n"
" Shader support (-DUSE_SHADER) : ${_SHADER}\n"
" Numpy support (-DUSE_NUMPY) : ${_NUMPY}\n"
+ " SpaceNav Device support (-DENABLE_SPNAV) : ${_SPNAV}\n"
" Optimize (-DOPTIMIZE) : ${_OPT}\n"
" Profiling support (-DPROFILE) : ${_PROFILE}\n"
" Double Precision (-DUSE_DOUBLE_PRECISION) : ${_DOUBLE_PREC}\n"
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index 50c89edb8..92cba1bfe 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -98,6 +98,7 @@ log_reader.hh
)
if (ENABLE_SPNAV)
+include_directories(${SPNAV_INCLUDE_DIR})
set(OST_GUI_INPUT_HEADERS
spnav_input.hh
IN_DIR input
--
GitLab