Skip to content

Commit 32f223b

Browse files
authored
Merge pull request #45 from opensim-org/build_452
Build 452 some settings will not work out of the box but will fix later
2 parents b443051 + 9dfc002 commit 32f223b

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

opensim/bld.bat

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ cmake ..\dependencies^
44
-G"Visual Studio 17 2022"^
55
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^
66
-DSUPERBUILD_ezc3d=ON^
7-
-DOPENSIM_WITH_TROPTER=ON^
87
-DOPENSIM_WITH_CASADI=ON
98

109
cmake --build . --config Release -- /maxcpucount:8
@@ -27,12 +26,11 @@ cmake ..\^
2726
-DOPENSIM_C3D_PARSER=ezc3d^
2827
-DOPENSIM_PYTHON_STANDALONE=ON^
2928
-DOPENSIM_WITH_CASADI=ON^
30-
-DOPENSIM_WITH_TROPTER=OFF^
31-
-DBUILD_TESTING=ON^
29+
-DBUILD_TESTING=OFF^
3230
-DBUILD_API_EXAMPLES=OFF^
3331
-DOPENSIM_BUILD_INDIVIDUAL_APPS=ON^
3432
-DOPENSIM_PYTHON_CONDA=ON^
35-
-DSWIG_EXECUTABLE="C:/ProgramData/chocolatey/bin/swig.exe"
33+
-DSWIG_EXECUTABLE=%SWIG_EXE%
3634
-LAH
3735

3836
cmake --build . --target install --config Release -- /maxcpucount:8

opensim/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ cmake ../dependencies/ -LAH \
1212
-DSUPERBUILD_simbody=ON \
1313
-DSUPERBUILD_spdlog=ON \
1414
-DSUPERBUILD_ezc3d=ON \
15-
-DOPENSIM_WITH_TROPTER=OFF \
16-
-DOPENSIM_WITH_CASADI=OFF
15+
-DOPENSIM_WITH_CASADI=ON
1716

1817
make -j8
1918
cd ..
2019

2120
# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/
2221

23-
if [ "$(uname)" == "Darwin" ]; then
22+
if [ $SWIG_DIR != ""]
23+
SWIG_DIR_SPEC=$SWIG_DIR
24+
else if [ "$(uname)" == "Darwin" ]; then
2425
SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.0.2
2526
else
2627
SWIG_DIR_SPEC=/home/runner/swig/
@@ -47,7 +48,6 @@ cmake ../ \
4748
-DBUILD_TESTING=OFF \
4849
-DOPENSIM_BUILD_INDIVIDUAL_APPS=ON \
4950
-DOPENSIM_COPY_DEPENDENCIES=ON \
50-
-DOPENSIM_WITH_TROPTER=OFF \
51-
-DOPENSIM_WITH_CASADI=OFF
51+
-DOPENSIM_WITH_CASADI=ON
5252
make -j8
5353
make install

opensim/meta.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
{% set version = "4.5.99" %}
1+
{% set version = "4.5.2" %}
22

33
package:
44
name: opensim
55
version: {{ version }}
66

77
source:
88
git_url: https://github.com/opensim-org/opensim-core.git
9-
git_rev: main
9+
git_rev: 4.5.2
1010
build:
1111
number: 1
1212
# NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets
@@ -27,6 +27,7 @@ requirements:
2727
- python {{ python }}
2828
- {{ compiler('c') }}
2929
- {{ compiler('cxx') }}
30+
- {{ compiler('fortran')}} # [linux]
3031
- openblas # [not win]
3132
- make # [not win]
3233

0 commit comments

Comments
 (0)