From a3e299c2c17d28aa8caea658622fe8032b8038c9 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Mon, 23 Sep 2024 16:32:59 -0700 Subject: [PATCH] Set flags for Moco dependencies on Linux and MacOS build scripts --- scripts/build/opensim-core-linux-build-script.sh | 2 +- scripts/build/opensim-core-macos-build-script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/opensim-core-linux-build-script.sh b/scripts/build/opensim-core-linux-build-script.sh index 24f3558fbb..a5948e99cb 100644 --- a/scripts/build/opensim-core-linux-build-script.sh +++ b/scripts/build/opensim-core-linux-build-script.sh @@ -196,7 +196,7 @@ echo echo "LOG: BUILDING OPENSIM-CORE..." mkdir -p ~/opensim-workspace/opensim-core-build || true cd ~/opensim-workspace/opensim-core-build -cmake ~/opensim-workspace/opensim-core-source -G"$GENERATOR" -DOPENSIM_DEPENDENCIES_DIR=~/opensim-workspace/opensim-core-dependencies-install/ -DBUILD_JAVA_WRAPPING=on -DBUILD_PYTHON_WRAPPING=on -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_TESTING=off -DCMAKE_INSTALL_PREFIX=~/opensim-core -DOPENSIM_INSTALL_UNIX_FHS=off -DSWIG_DIR=~/swig/share/swig -DSWIG_EXECUTABLE=~/swig/bin/swig +cmake ~/opensim-workspace/opensim-core-source -G"$GENERATOR" -DOPENSIM_DEPENDENCIES_DIR=~/opensim-workspace/opensim-core-dependencies-install/ -DBUILD_JAVA_WRAPPING=on -DBUILD_PYTHON_WRAPPING=on -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_TESTING=off -DCMAKE_INSTALL_PREFIX=~/opensim-core -DOPENSIM_INSTALL_UNIX_FHS=off -DSWIG_DIR=~/swig/share/swig -DSWIG_EXECUTABLE=~/swig/bin/swig -DOPENSIM_WITH_CASADI=$MOCO -DOPENSIM_WITH_TROPTER=$MOCO cmake . -LAH cmake --build . --config $DEBUG_TYPE -j$NUM_JOBS echo diff --git a/scripts/build/opensim-core-macos-build-script.sh b/scripts/build/opensim-core-macos-build-script.sh index 4d9864d4c5..4d2e47de1a 100644 --- a/scripts/build/opensim-core-macos-build-script.sh +++ b/scripts/build/opensim-core-macos-build-script.sh @@ -112,7 +112,7 @@ echo echo "LOG: BUILDING OPENSIM-CORE..." mkdir -p ~/opensim-workspace/opensim-core-build || true cd ~/opensim-workspace/opensim-core-build -cmake ~/opensim-workspace/opensim-core-source -G"$GENERATOR" -DOPENSIM_DEPENDENCIES_DIR=~/opensim-workspace/opensim-core-dependencies-install/ -DBUILD_JAVA_WRAPPING=on -DBUILD_PYTHON_WRAPPING=on -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_TESTING=off -DCMAKE_INSTALL_PREFIX=~/opensim-core -DOPENSIM_INSTALL_UNIX_FHS=off -DSWIG_DIR=~/swig/share/swig -DSWIG_EXECUTABLE=~/swig/bin/swig -DJAVA_HOME=$(/usr/libexec/java_home -v 1.8) -DJAVA_INCLUDE_PATH=$(/usr/libexec/java_home -v 1.8)/include -DJAVA_INCLUDE_PATH2=$(/usr/libexec/java_home -v 1.8)/include/darwin -DJAVA_AWT_INCLUDE_PATH=$(/usr/libexec/java_home -v 1.8)/include +cmake ~/opensim-workspace/opensim-core-source -G"$GENERATOR" -DOPENSIM_DEPENDENCIES_DIR=~/opensim-workspace/opensim-core-dependencies-install/ -DBUILD_JAVA_WRAPPING=on -DBUILD_PYTHON_WRAPPING=on -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_TESTING=off -DCMAKE_INSTALL_PREFIX=~/opensim-core -DOPENSIM_INSTALL_UNIX_FHS=off -DSWIG_DIR=~/swig/share/swig -DSWIG_EXECUTABLE=~/swig/bin/swig -DJAVA_HOME=$(/usr/libexec/java_home -v 1.8) -DJAVA_INCLUDE_PATH=$(/usr/libexec/java_home -v 1.8)/include -DJAVA_INCLUDE_PATH2=$(/usr/libexec/java_home -v 1.8)/include/darwin -DJAVA_AWT_INCLUDE_PATH=$(/usr/libexec/java_home -v 1.8)/include -DOPENSIM_WITH_CASADI=$MOCO -DOPENSIM_WITH_TROPTER=$MOCO cmake . -LAH cmake --build . --config $DEBUG_TYPE -j$NUM_JOBS echo