Revision: 38991
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38991
Author: campbellbarton
Date: 2011-08-03 14:18:02 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
enable NDOF by default with cmake again, but check if it can be found on OSX,
if not disable.
I cant test this but at least if I made a mistake it will just not find the SDK
and disable. an osx dev needs to test.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-08-03 14:04:48 UTC (rev 38990)
+++ trunk/blender/CMakeLists.txt 2011-08-03 14:18:02 UTC (rev 38991)
@@ -179,7 +179,7 @@
option(WITH_LZMA "Enable best LZMA compression, (used for
pointcache)" ON)
# Misc
-option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and
friends)" OFF)
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and
friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime,
otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -998,9 +998,24 @@
elseif(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS}
-framework QuickTime")
endif()
+
+ # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+ # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+ if(WITH_INPUT_NDOF)
+ # This thread it *should* work and check the framework
- campbell
+ #
http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+ find_library(3D_CONNEXION_CLIENT_LIBRARY
+ NAMES 3DconnexionClient
+ )
+ if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
+ set(WITH_INPUT_NDOF OFF)
+ endif()
+ endif()
+
else()
set(PLATFORM_CFLAGS "-pipe -funsigned-char")
set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices
-framework Foundation -framework IOKit -framework AppKit -framework Carbon
-framework AGL -framework AudioUnit -framework AudioToolbox -framework
CoreAudio -framework QuickTime")
+ set(WITH_INPUT_NDOF OFF) # unsupported
endif()
if(WITH_OPENCOLLADA)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
