diff options
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1c8fec02a..674e532ff2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -644,20 +644,15 @@ if(UNIX AND NOT APPLE) if(WITH_BOOST) # uses in build instructions to override include and library variables if(NOT BOOST_CUSTOM) - # XXX No more lib dir, is this multithread stuff still needed? if(${WITH_STATIC_LIBS}) set(Boost_USE_STATIC_LIBS ON) endif() - if(NOT BOOST_ROOT) - set(Boost_USE_MULTITHREADED OFF) - else() - set(Boost_USE_MULTITHREADED ON) - endif() + set(Boost_USE_MULTITHREADED ON) set(__boost_packages filesystem regex system thread date_time) if (WITH_INTERNATIONAL) list(APPEND __boost_packages locale) endif() - find_package(Boost 1.34 COMPONENTS ${__boost_packages}) + find_package(Boost 1.48 COMPONENTS ${__boost_packages}) if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU) find_package(IcuLinux) endif() @@ -1521,7 +1516,8 @@ elseif(APPLE) endif() if(WITH_INPUT_NDOF) - set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient") + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient") + set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers ) endif() endif() |