diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-05-24 08:57:17 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-05-24 08:57:17 +0300 |
| commit | 886349fd982847466b3215f8b5eebf71ea86f3ac (patch) | |
| tree | eee98727a920c128c3849f258edb5d30f1d06bb6 /build_files | |
| parent | 84e083953798b73ee05e9ad7161a22bcfbbdf083 (diff) | |
ndof: build system cleanup
Only Linux needs a lib linked in (libspnav).
ghostndof3dconnexion refers to an obsolete Mac driver shim.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index f14c954b025..47fc86c4f20 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -435,9 +435,6 @@ function(setup_liblinks if(WITH_MEM_JEMALLOC) target_link_libraries(${target} ${JEMALLOC_LIBRARIES}) endif() - if(WITH_INPUT_NDOF) - target_link_libraries(${target} ${NDOF_LIBRARIES}) - endif() if(WITH_MOD_CLOTH_ELTOPO) target_link_libraries(${target} ${LAPACK_LIBRARIES}) endif() @@ -451,6 +448,9 @@ function(setup_liblinks if(WITH_OPENMP_STATIC) target_link_libraries(${target} ${OpenMP_LIBRARIES}) endif() + if(WITH_INPUT_NDOF) + target_link_libraries(${target} ${NDOF_LIBRARIES}) + endif() endif() # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them.. @@ -661,10 +661,6 @@ function(SETUP_BLENDER_SORTED_LIBS) list(APPEND BLENDER_SORTED_LIBS bf_quicktime) endif() - if(WITH_INPUT_NDOF) - list(APPEND BLENDER_SORTED_LIBS bf_intern_ghostndof3dconnexion) - endif() - if(WITH_MOD_BOOLEAN) list(APPEND BLENDER_SORTED_LIBS extern_carve) endif() |