Skip to content

bindings/CMakeLists.txt: Use swig_add_library() #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thp merged 5 commits into from
Jul 30, 2018
+10 −7
Merged

bindings/CMakeLists.txt: Use swig_add_library() #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a60652
bindings/CMakeLists.txt: Use swig_add_library()
thp Jul 27, 2018
dc8d078
Build PS Move API for 64-bit on macOS
thp Jul 27, 2018
9474c08
Disable building SWIG-based bindings on macOS
thp Jul 27, 2018
88966a6
Also don't build the C# bindings
thp Jul 27, 2018
c238228
Don't package tracker for macOS
thp Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bindings/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions scripts/build_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions scripts/macos/build-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ 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 \
-DPSMOVE_BUILD_CSHARP_BINDINGS=OFF \
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
-DOpenCV_DIR="${OPENCV_BUILD_DIR}" ..
make ${MAKE_ARGS}