Hi folks,

Work on the easybuild branch continues apace.  Here's a recent commit
for NDOF (support library for the 3DConnexion Space Navigator) which
makes Linux 64-bit support less painful.  Anyone care to write the
missing FindNDOF referred to in the patch below?

Rob
-------- Original Message --------
Subject:        [sldev-commits] r2122 - projects/2009/easybuild/indra/cmake
Date:   Thu, 16 Apr 2009 13:25:08 -0500 (CDT)
From:   [email protected]
Reply-To:       [email protected]
To:     [email protected]



Author: king.broadfoot
Date: 2009-04-16 13:25:08 -0500 (Thu, 16 Apr 2009)
New Revision: 2122

Modified:
   projects/2009/easybuild/indra/cmake/NDOF.cmake
Trac: http://svn.secondlife.com/trac/linden/changeset/2122
Log:
Do not request prebuilt ndofdev in STANDALONE mode

This disables NDOF support on linux64, but allows the build to complete.
Support can be re-enabled when a proper FindNDOF module is written.

Modified: projects/2009/easybuild/indra/cmake/NDOF.cmake
===================================================================
--- projects/2009/easybuild/indra/cmake/NDOF.cmake      2009-04-16 17:35:31 UTC 
(rev 2121)
+++ projects/2009/easybuild/indra/cmake/NDOF.cmake      2009-04-16 18:25:08 UTC 
(rev 2122)
@@ -1,7 +1,16 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-use_prebuilt_binary(ndofdev)
+if (STANDALONE)
+  # No ndofdev is available for linux64.
+  if(LINUX AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+    message(STATUS "Building without N-DoF joystick support")
+    return()
+  endif(LINUX AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+  # TODO: include(FindNDOF)
+else (STANDALONE)
+  use_prebuilt_binary(ndofdev)
+endif (STANDALONE)
 
 if (WINDOWS OR DARWIN OR LINUX)
   add_definitions(-DLIB_NDOF=1)

_______________________________________________
Click here to unsubscribe or manage your list subscription:
https://lists.secondlife.com/cgi-bin/mailman/listinfo/sldev-commits

_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/SLDev
Please read the policies before posting to keep unmoderated posting privileges

Reply via email to