Skip to content

Commit a21430c

Browse files
committed
Build utility applications (opensim-cmd) and use currently available vs version
1 parent ea24e1b commit a21430c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

opensim/bld.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mkdir opensim_dependencies_build
22
cd .\opensim_dependencies_build
33
cmake ..\dependencies^
4-
-G"Visual Studio 16 2019"^
4+
-G"Visual Studio 17 2022"^
55
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^
66
-DSUPERBUILD_ezc3d=ON^
77
-DOPENSIM_WITH_TROPTER=OFF^
@@ -12,7 +12,7 @@ cd ..
1212
mkdir opensim_build
1313
cd .\opensim_build
1414
cmake ..\^
15-
-G"Visual Studio 16 2019"^
15+
-G"Visual Studio 17 2022"^
1616
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^
1717
-DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^
1818
-DCMAKE_INSTALL_INCLUDEDIR="%LIBRARY_PREFIX%/include"^
@@ -30,7 +30,7 @@ cmake ..\^
3030
-DOPENSIM_WITH_TROPTER=OFF^
3131
-DBUILD_TESTING=OFF^
3232
-DBUILD_API_EXAMPLES=OFF^
33-
-DOPENSIM_BUILD_INDIVIDUAL_APPS=OFF^
33+
-DOPENSIM_BUILD_INDIVIDUAL_APPS=ON^
3434
-DOPENSIM_PYTHON_CONDA=ON
3535
cmake --build . --target install --config Release -- /maxcpucount:8
3636

opensim/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cmake ../ \
4444
-DOPENSIM_PYTHON_STANDALONE=ON \
4545
-DOPENSIM_INSTALL_UNIX_FHS=ON \
4646
-DBUILD_API_ONLY=ON \
47-
-DOPENSIM_BUILD_INDIVIDUAL_APPS_DEFAULT=OFF \
47+
-DOPENSIM_BUILD_INDIVIDUAL_APPS_DEFAULT=ON \
4848
-DOPENSIM_COPY_DEPENDENCIES=ON \
4949
-DOPENSIM_WITH_TROPTER=OFF \
5050
-DOPENSIM_WITH_CASADI=OFF

opensim/meta.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package:
66

77
source:
88
git_url: https://github.com/opensim-org/opensim-core.git
9-
git_rev: branch_4.4
9+
git_rev: branch_4.4_conda
1010
build:
1111
number: 2
1212
# NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets
@@ -32,8 +32,8 @@ requirements:
3232
- make # [not win]
3333

3434
run:
35-
- python
36-
- numpy
35+
- numpy {{ numpy }}
36+
- python {{ python }}
3737
- freeglut # [win]
3838
- openblas # [not win]
3939

0 commit comments

Comments
 (0)