diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-02 09:52:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-02 09:52:27 +0400 |
| commit | fcd7d2b486f2435907423188ffdfe2840c966b0b (patch) | |
| tree | 58414c67c39fea1e654ce2380fbbb2488716b0b5 /CMakeLists.txt | |
| parent | 8f3016098d726ec82b7f778d1e0a0d58f3da74cb (diff) | |
NDOF related edits
- fix for building without NDOF on X11
- quiet some warnings
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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() |