From 84e083953798b73ee05e9ad7161a22bcfbbdf083 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Tue, 24 May 2016 00:35:17 -0400 Subject: [PATCH] ndof: enable Linux support by default, unless libs missing --- CMakeLists.txt | 9 +++------ 1 file 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()