From 02913d28b3d9cc8805537afcbe4375fa21c313f3 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Tue, 28 Sep 2010 03:01:40 +0200
Subject: RED-552: VWR-12838: NDOF is assumed to exist, even with --standalone.
See http://redmine.imprudenceviewer.org/issues/552
Add FindNDOF.cmake and treat it like every other library (on
standalone).
---
linden/indra/cmake/FindNDOF.cmake | 39 +++++++++++++++++++++++++++++++++++++++
linden/indra/cmake/NDOF.cmake | 32 +++++++++++++++++++++++---------
2 files changed, 62 insertions(+), 9 deletions(-)
create mode 100644 linden/indra/cmake/FindNDOF.cmake
(limited to 'linden/indra')
diff --git a/linden/indra/cmake/FindNDOF.cmake b/linden/indra/cmake/FindNDOF.cmake
new file mode 100644
index 0000000..f980e34
--- /dev/null
+++ b/linden/indra/cmake/FindNDOF.cmake
@@ -0,0 +1,39 @@
+# -*- cmake -*-
+
+# - Find NDOF
+# Find the NDOF includes and library
+# This module defines
+# NDOF_INCLUDE_DIR, where to find ndofdev_external.h, etc.
+# NDOF_LIBRARY, the library needed to use NDOF.
+# NDOF_FOUND, If false, do not try to use NDOF.
+
+find_path(NDOF_INCLUDE_DIR ndofdev_external.h
+ PATH_SUFFIXES ndofdev
+ )
+
+set(NDOF_NAMES ${NDOF_NAMES} ndofdev libndofdev)
+find_library(NDOF_LIBRARY
+ NAMES ${NDOF_NAMES}
+ )
+
+if (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
+ set(NDOF_FOUND "YES")
+else (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
+ set(NDOF_FOUND "NO")
+endif (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
+
+
+if (NDOF_FOUND)
+ if (NOT NDOF_FIND_QUIETLY)
+ message(STATUS "Found NDOF: Library in '${NDOF_LIBRARY}' and header in '${NDOF_INCLUDE_DIR}' ")
+ endif (NOT NDOF_FIND_QUIETLY)
+else (NDOF_FOUND)
+ if (NDOF_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find NDOF library!")
+ endif (NDOF_FIND_REQUIRED)
+endif (NDOF_FOUND)
+
+mark_as_advanced(
+ NDOF_LIBRARY
+ NDOF_INCLUDE_DIR
+ )
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake
index dad74e9..bdf5db1 100644
--- a/linden/indra/cmake/NDOF.cmake
+++ b/linden/indra/cmake/NDOF.cmake
@@ -1,14 +1,28 @@
# -*- cmake -*-
include(Prebuilt)
-use_prebuilt_binary(ndofdev)
+if (STANDALONE)
+ include(FindNDOF)
+ if(NOT NDOF_FOUND)
+ message(STATUS "Building without N-DoF joystick support")
+ endif(NOT NDOF_FOUND)
+else (STANDALONE)
+ use_prebuilt_binary(ndofdev)
-if (WINDOWS OR DARWIN OR LINUX)
- add_definitions(-DLIB_NDOF=1)
-endif (WINDOWS OR DARWIN OR LINUX)
+ if (WINDOWS)
+ set(NDOF_LIBRARY libndofdev)
+ elseif (DARWIN OR LINUX)
+ set(NDOF_LIBRARY ndofdev)
+ endif (WINDOWS)
+
+ set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
+ set(NDOF_FOUND 1)
+endif (STANDALONE)
-if (WINDOWS)
- set(NDOF_LIBRARY libndofdev)
-elseif (DARWIN OR LINUX)
- set(NDOF_LIBRARY ndofdev)
-endif (WINDOWS)
+if (NDOF_FOUND)
+ add_definitions(-DLIB_NDOF=1)
+ include_directories(${NDOF_INCLUDE_DIR})
+else (NDOF_FOUND)
+ set(NDOF_INCLUDE_DIR "")
+ set(NDOF_LIBRARY "")
+endif (NDOF_FOUND)
--
cgit v1.1