Commit: 07abcafc8b511fee7ed11dc2d4b9d7b10925b313
Author: Mike Erwin
Date: Sat May 21 18:29:55 2016 -0400
Branches: compositor-2016
https://developer.blender.org/rB07abcafc8b511fee7ed11dc2d4b9d7b10925b313
ndof: simplify Mac build
We don’t require the 3Dconnexion driver framework at build time.
No special link flags or include paths needed.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 408cf22..a950fc5 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
