
Submitter:	Aleric Inglewood	Reviewers
Branch:		Groups:	viewer
Bugs:	VWR-10579	People:
Change Number:	None	Repository:	viewer-development

Description:

On standalone, only define -DLIB_NDOF=1 when NDOF can be found.

Testing Done:

I can't remember when I started using this, but it was long ago. I don't have libndofdev installed.
I just installed Michelle's debian package libndofdev-dev and then it found it:
-- Found NDOF: Library in '/usr/lib/libndofdev.so' and header in '/usr/include'

Diff revision 2 (Latest)

Jump to revision:	1 2
Changes between r2 and:	1 2

Files Changed:

     # -*- 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 " * * *\nCould not find NDOF library!\nIf you don't need Space Navigator Joystick support you can skip this test by configuring with -DNDOF:BOOL=OFF\n * * *")
       endif (NDOF_FIND_REQUIRED)
     endif (NDOF_FOUND)
     mark_as_advanced(
       NDOF_LIBRARY
       NDOF_INCLUDE_DIR
+      )

indra/cmake/NDOF.cmake
Revision b0689af42a71	New Change

You have a pending review.

Other reviews

Your comment

Review Board 1.6.11

This change has been marked as submitted.

VWR-10579: Fix NDOF.cmake to do the right thing on standalone.

Diff revision 2 (Latest)