From 9a60652b7a1758644fab2d8e361e27648eaf1e5c Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 27 Jul 2018 15:41:10 +0200 Subject: [PATCH 1/5] bindings/CMakeLists.txt: Use swig_add_library() --- bindings/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index b6ceeaf7..63f3eecd 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -24,7 +24,7 @@ if(SWIG_FOUND) if(PYTHONLIBS_FOUND) unset(CMAKE_SWIG_FLAGS) include_directories(${PYTHON_INCLUDE_PATH}) - swig_add_module(psmove python ${CMAKE_CURRENT_LIST_DIR}/psmove.i) + swig_add_library(psmove LANGUAGE python SOURCES ${CMAKE_CURRENT_LIST_DIR}/psmove.i) swig_link_libraries(psmove psmoveapi ${PYTHON_LIBRARIES}) if (PSMOVE_BUILD_TRACKER) swig_link_libraries(psmove psmoveapi_tracker) @@ -45,7 +45,7 @@ if(SWIG_FOUND) set(CMAKE_SWIG_FLAGS -package ${PSMOVEAPI_JAVA_PKG}) include_directories(${JNI_INCLUDE_DIRS}) - swig_add_module(psmove_java java ${CMAKE_CURRENT_LIST_DIR}/psmove.i) + swig_add_library(psmove_java LANGUAGE java SOURCES ${CMAKE_CURRENT_LIST_DIR}/psmove.i) swig_link_libraries(psmove_java psmoveapi ${JNI_LIBRARIES}) if (PSMOVE_BUILD_TRACKER) swig_link_libraries(psmove_java psmoveapi_tracker) @@ -146,7 +146,7 @@ if(SWIG_FOUND) set(PSMOVEAPI_CSHARP_NS "io.thp.psmove") set(CMAKE_SWIG_FLAGS -namespace ${PSMOVEAPI_CSHARP_NS}) - swig_add_module(psmoveapi_csharp csharp ${CMAKE_CURRENT_LIST_DIR}/psmove.i) + swig_add_library(psmoveapi_csharp LANGUAGE csharp SOURCES ${CMAKE_CURRENT_LIST_DIR}/psmove.i) swig_link_libraries(psmoveapi_csharp psmoveapi) if (PSMOVE_BUILD_TRACKER) swig_link_libraries(psmoveapi_csharp psmoveapi_tracker) From dc8d078e9da97efc3f454dabfb2b9234ec38a2fd Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 27 Jul 2018 15:59:01 +0200 Subject: [PATCH 2/5] Build PS Move API for 64-bit on macOS --- scripts/macos/build-macos | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/macos/build-macos b/scripts/macos/build-macos index 07387f53..da84a5b3 100644 --- a/scripts/macos/build-macos +++ b/scripts/macos/build-macos @@ -103,5 +103,6 @@ cmake -DPSMOVE_USE_PS3EYE_DRIVER=ON \ -DPSMOVE_BUILD_TRACKER=ON \ -DPSMOVE_BUILD_JAVA_BINDINGS=ON \ -DPSMOVE_BUILD_PROCESSING_BINDINGS=ON \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DOpenCV_DIR="${OPENCV_BUILD_DIR}" .. make ${MAKE_ARGS} From 9474c08a017bcc061cd46d537bfbb5a9b1be840c Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 27 Jul 2018 16:11:35 +0200 Subject: [PATCH 3/5] Disable building SWIG-based bindings on macOS --- scripts/macos/build-macos | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/macos/build-macos b/scripts/macos/build-macos index da84a5b3..0a05243a 100644 --- a/scripts/macos/build-macos +++ b/scripts/macos/build-macos @@ -101,8 +101,9 @@ mkdir build cd build cmake -DPSMOVE_USE_PS3EYE_DRIVER=ON \ -DPSMOVE_BUILD_TRACKER=ON \ - -DPSMOVE_BUILD_JAVA_BINDINGS=ON \ - -DPSMOVE_BUILD_PROCESSING_BINDINGS=ON \ + -DPSMOVE_BUILD_JAVA_BINDINGS=OFF \ + -DPSMOVE_BUILD_PROCESSING_BINDINGS=OFF \ + -DPSMOVE_BUILD_PYTHON_BINDINGS=OFF \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DOpenCV_DIR="${OPENCV_BUILD_DIR}" .. make ${MAKE_ARGS} From 88966a66f570646d8cc4932b7ec125aab9a88c39 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 27 Jul 2018 16:23:10 +0200 Subject: [PATCH 4/5] Also don't build the C# bindings --- scripts/macos/build-macos | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/macos/build-macos b/scripts/macos/build-macos index 0a05243a..5ad33d76 100644 --- a/scripts/macos/build-macos +++ b/scripts/macos/build-macos @@ -104,6 +104,7 @@ cmake -DPSMOVE_USE_PS3EYE_DRIVER=ON \ -DPSMOVE_BUILD_JAVA_BINDINGS=OFF \ -DPSMOVE_BUILD_PROCESSING_BINDINGS=OFF \ -DPSMOVE_BUILD_PYTHON_BINDINGS=OFF \ + -DPSMOVE_BUILD_CSHARP_BINDINGS=OFF \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DOpenCV_DIR="${OPENCV_BUILD_DIR}" .. make ${MAKE_ARGS} From c2382286f266ef43b650128dfa9eff2bf70dd298 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 27 Jul 2018 19:13:23 +0200 Subject: [PATCH 5/5] Don't package tracker for macOS --- scripts/build_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_package.sh b/scripts/build_package.sh index 458f61fd..c184f660 100644 --- a/scripts/build_package.sh +++ b/scripts/build_package.sh @@ -85,12 +85,12 @@ case "$BUILD_TYPE" in BUILDDIR=build PLATFORM_BIN=" build/psmove - build/test_tracker " + #build/test_tracker PLATFORM_LIB=" build/libpsmoveapi.dylib - build/libpsmoveapi_tracker.dylib " + #build/libpsmoveapi_tracker.dylib pkg_tarball # Workaround for macOS to find the sphinx-build binary installed via pip