Commit: 82b59843f045880eccabf2631655d70501c0b7ce
Author: Mike Erwin
Date: Tue May 24 00:35:17 2016 -0400
Branches: compositor-2016
https://developer.blender.org/rB82b59843f045880eccabf2631655d70501c0b7ce
ndof: enable Linux support by default, unless libs missing
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1539a55..2b40b92 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()
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
