Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--build_files/cmake/macros.cmake7
2 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb59b35f406..19d9ea942a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 34301458a06..3de9db6dac9 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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()