[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38589] branches/merwin-spacenav: enable CMake builds with spacenav (contributed by Kevin Cozens)

[Mike Erwin]

Revision: 38589
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38589
Author:   merwin
Date:     2011-07-21 21:34:28 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
enable CMake builds with spacenav (contributed by Kevin Cozens)

Modified Paths:
--------------
    branches/merwin-spacenav/CMakeLists.txt
    branches/merwin-spacenav/build_files/cmake/macros.cmake

Modified: branches/merwin-spacenav/CMakeLists.txt
===================================================================
--- branches/merwin-spacenav/CMakeLists.txt     2011-07-21 21:34:08 UTC (rev 
38588)
+++ branches/merwin-spacenav/CMakeLists.txt     2011-07-21 21:34:28 UTC (rev 
38589)
@@ -457,7 +457,7 @@
                        set(NDOF /usr)
                        set(NDOF_INC ${NDOF}/include)
                        set(NDOF_LIB spnav)
-                       set(NDOF_LIBPATH ${FFTW3}/lib)
+                       set(NDOF_LIBPATH ${NDOF}/lib)
                endif()
        endif()
 

Modified: branches/merwin-spacenav/build_files/cmake/macros.cmake
===================================================================
--- branches/merwin-spacenav/build_files/cmake/macros.cmake     2011-07-21 
21:34:08 UTC (rev 38588)
+++ branches/merwin-spacenav/build_files/cmake/macros.cmake     2011-07-21 
21:34:28 UTC (rev 38589)
@@ -193,6 +193,9 @@
        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 @@
        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()

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs