diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-05-22 01:29:55 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-05-22 01:29:55 +0300 |
| commit | 9bf09200d29f1882eb653ba3390191608a9eebb1 (patch) | |
| tree | 9eed2758cf1ca4137376b182ea5033126e201088 /CMakeLists.txt | |
| parent | 6bd248cd65405854abafe9fb2201f3785d5259af (diff) | |
ndof: simplify Mac build
We don’t require the 3Dconnexion driver framework at build time.
No special link flags or include paths needed.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 408cf22035c..a950fc5d893 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2145,24 +2145,6 @@ elseif(APPLE) list(APPEND PLATFORM_LINKLIBS stdc++) endif() - # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED! - # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL - if(WITH_INPUT_NDOF) - # This thread it *should* work and check the framework - campbell - # http://www.cmake.org/pipermail/cmake/2005-December/007740.html - find_library(3DCONNEXION_CLIENT_FRAMEWORK - NAMES 3DconnexionClient - ) - if(NOT 3DCONNEXION_CLIENT_FRAMEWORK) - set(WITH_INPUT_NDOF OFF) - endif() - - if(WITH_INPUT_NDOF) - set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient") - set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers ) - endif() - endif() - if(WITH_JACK) set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp") endif() @@ -2230,10 +2212,6 @@ elseif(APPLE) set(TIFF_LIBPATH ${TIFF}/lib) endif() - if(WITH_INPUT_NDOF) - # linker needs "-weak_framework 3DconnexionClient" - endif() - if(WITH_BOOST) set(BOOST ${LIBDIR}/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) |