Skip to content
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

Jump to bottom

add missing type API + upgrade java #663

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add missing type API + upgrade java #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e49b1f7
add missing type API + upgrade java
antoinefalisse Dec 15, 2020
9803b0e
supress warning clang + update CI
antoinefalisse Dec 15, 2020
8d18c3a
GITHUB_ENV github actions
antoinefalisse Dec 16, 2020
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
4 changes: 2 additions & 2 deletions .github/workflows/continuous_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
(New-Object System.Net.WebClient).DownloadFile("https://sourceforge.net/projects/myosin/files/doxygen-1.8.14.windows.x64.bin.zip/download", "doxygen.zip")
7z x $env:GITHUB_WORKSPACE/doxygen.zip -odoxygen
echo "::add-path::$env:GITHUB_WORKSPACE\\doxygen"
echo "$env:GITHUB_WORKSPACE\\doxygen" >> $GITHUB_PATH

- name: Install NumPy
run: python -m pip install numpy
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
cmake . -LAH
VERSION=`cmake -L . | grep MOCO_FULL_VERSION | cut -d "=" -f2`
echo $VERSION
echo "::set-env name=VERSION::$VERSION"
echo "VERSION=$version" >> $GITHUB_ENV
echo "::set-output name=version::$VERSION"

- name: Build Moco
Expand Down
2 changes: 1 addition & 1 deletion Moco/Bindings/Java/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ add_custom_command(
${SWIG_JAVA_SOURCE_BUILD_OUTPUT_DIR}
COMMAND ${JAVA_COMPILE}
org/opensim/modeling/*.java
-source 1.6 -target 1.6
-source 1.7 -target 1.7
COMMAND ${JAVA_ARCHIVE} -cvf ${SWIG_JAVA_JAR_NAME}
org/opensim/modeling/*.class
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src
Expand Down
1 change: 1 addition & 0 deletions Moco/Moco/RegisterTypes_osimMoco.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ static osimMocoInstantiator instantiator;
OSIMMOCO_API void RegisterTypes_osimMoco() {
try {
Object::registerType(MocoFinalTimeGoal());
Object::registerType(MocoAverageSpeedGoal());
Object::registerType(MocoWeight());
Object::registerType(MocoWeightSet());
Object::registerType(MocoStateTrackingGoal());
Expand Down
2 changes: 1 addition & 1 deletion dependencies/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ else()
COMMAND cd <SOURCE_DIR>/ThirdParty/Mumps && ./get.Mumps
# GCC 10 generates a warning when compiling MUMPS that we must suppress using
# -fallow-argument-mismatch.
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> ADD_FFLAGS=-fallow-argument-mismatch
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> ADD_FFLAGS=-fallow-argument-mismatch ADD_CFLAGS=-Wno-error=implicit-function-declaration
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} ${BUILD_FLAGS}
INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install)
endif()
Expand Down