Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2016-05-24 07:35:17 +0300
committerMike Erwin <significant.bit@gmail.com>2016-05-24 07:35:17 +0300
commit84e083953798b73ee05e9ad7161a22bcfbbdf083 (patch)
tree251f3e6e89e69afa808d73679035bcddf67c1b09 /CMakeLists.txt
parent999d5a67852b5958b9361c9888734ebc889e4a22 (diff)
ndof: enable Linux support by default, unless libs missing
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt9
1 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1539a55d74d..2b40b9268fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,6 @@ if(UNIX AND NOT APPLE)
set(_init_CODEC_FFMPEG OFF)
set(_init_CYCLES_OSL OFF)
set(_init_IMAGE_OPENEXR OFF)
- set(_init_INPUT_NDOF OFF)
set(_init_JACK OFF)
set(_init_OPENCOLLADA OFF)
set(_init_OPENCOLORIO OFF)
@@ -1034,14 +1033,12 @@ if(UNIX AND NOT APPLE)
if(WITH_INPUT_NDOF)
find_package_wrapper(Spacenav)
- if(NOT SPACENAV_FOUND)
- set(WITH_INPUT_NDOF OFF)
- endif()
-
- # use generic names within blenders buildsystem.
if(SPACENAV_FOUND)
+ # use generic names within blenders buildsystem.
set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS})
set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES})
+ else()
+ set(WITH_INPUT_NDOF OFF)
endif()
endif()