From fcd7d2b486f2435907423188ffdfe2840c966b0b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 2 Aug 2011 05:52:27 +0000 Subject: NDOF related edits - fix for building without NDOF on X11 - quiet some warnings --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ac6d67cd1c..fe86aaf9b26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,7 +179,7 @@ option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON) # Misc -option(WITH_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) +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) @@ -453,7 +453,7 @@ if(UNIX AND NOT APPLE) endif() endif() - if (WITH_NDOF) + if (WITH_INPUT_NDOF) if(CMAKE_SYSTEM_NAME MATCHES "Linux") set(NDOF /usr) set(NDOF_INC ${NDOF}/include) @@ -1039,7 +1039,7 @@ elseif(APPLE) set(TIFF_LIBPATH ${TIFF}/lib) endif() - if (WITH_NDOF) + if (WITH_INPUT_NDOF) # linker needs "-weak_framework 3DconnexionClient" endif() -- cgit v1.2.3