enable CMake builds with spacenav (contributed by Kevin Cozens)
authorMike Erwin <significant.bit@gmail.com>
Thu, 21 Jul 2011 21:34:28 +0000 (21:34 +0000)
committerMike Erwin <significant.bit@gmail.com>
Thu, 21 Jul 2011 21:34:28 +0000 (21:34 +0000)
CMakeLists.txt
build_files/cmake/macros.cmake

index cb59b35..19d9ea9 100644 (file)
@@ -457,7 +457,7 @@ if(UNIX AND NOT APPLE)
                        set(NDOF /usr)
                        set(NDOF_INC ${NDOF}/include)
                        set(NDOF_LIB spnav)
-                       set(NDOF_LIBPATH ${FFTW3}/lib)
+                       set(NDOF_LIBPATH ${NDOF}/lib)
                endif()
        endif()
 
index 3430145..3de9db6 100644 (file)
@@ -193,6 +193,9 @@ macro(SETUP_LIBDIRS)
        if(WITH_MEM_JEMALLOC)
                link_directories(${JEMALLOC_LIBPATH})
        endif()
+       if(WITH_NDOF)
+               link_directories(${NDOF_LIBPATH})
+       endif()
 
        if(WIN32 AND NOT UNIX)
                link_directories(${PTHREADS_LIBPATH})
@@ -314,6 +317,10 @@ macro(setup_liblinks
        if(WITH_MEM_JEMALLOC)
                target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
        endif()
+       if(WITH_NDOF)
+               target_link_libraries(${target} ${NDOF_LIBRARY})
+       endif()
+
        if(WIN32 AND NOT UNIX)
                target_link_libraries(${target} ${PTHREADS_LIBRARIES})
        endif()