diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-02 10:32:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-02 10:32:53 +0400 |
| commit | baa37b1b464d8f05bf5d788ec66ae46bdc675a0f (patch) | |
| tree | 1f09ce338d00ec5fb2bab272b9264229348b436b /CMakeLists.txt | |
| parent | fcd7d2b486f2435907423188ffdfe2840c966b0b (diff) | |
more cmake/x11 edits
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe86aaf9b26..d95cbb6e536 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -454,11 +454,15 @@ if(UNIX AND NOT APPLE) endif() if (WITH_INPUT_NDOF) - if(CMAKE_SYSTEM_NAME MATCHES "Linux") - set(NDOF /usr) - set(NDOF_INC ${NDOF}/include) - set(NDOF_LIBRARY spnav) - set(NDOF_LIBPATH ${NDOF}/lib) + find_package(Spacenav) + if(NOT SPACENAV_FOUND) + set(WITH_INPUT_NDOF OFF) + endif() + + # use generic names within blenders buildsystem. + if(SPACENAV_FOUND) + set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS}) + set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES}) endif() endif() @@ -1334,6 +1338,7 @@ if(FIRST_RUN) info_cfg_option(WITH_OPENCOLLADA) info_cfg_option(WITH_FFTW3) info_cfg_option(WITH_INTERNATIONAL) + info_cfg_option(WITH_INPUT_NDOF) info_cfg_text("Compiler Options:") info_cfg_option(WITH_BUILDINFO) |