Skip to content

Commit fb5fac1

Browse files
authored
Opensim 452 (#4060)
* Update version to 4.5.2 in CMakeLists.txt * Update cmake min version for dependencies to make ci happy, also change section label in CHANGELOG.md * Update continuous_integration.yml * workaround cmake min version unsupported * tweak syntax for cmake option * Update continuous_integration.yml avoid upgrading cmake * Update CMakeLists.txt Undo cmake change, just pin cmake in ci file instead * Update continuous_integration.yml add MD flag to cxx on windows
1 parent 81f6d99 commit fb5fac1

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/continuous_integration.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
# /W0 disables warnings.
6969
# https://msdn.microsoft.com/en-us/library/19z1t1wy.aspx
7070
# TODO: CMake provides /W3, which overrides our /W0
71-
cmake -E env CXXFLAGS="/W0" cmake $env:GITHUB_WORKSPACE/dependencies -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim_dependencies_install -DSUPERBUILD_ezc3d=ON -DOPENSIM_WITH_CASADI=ON
71+
cmake -E env CXXFLAGS="/W0 /MD" cmake $env:GITHUB_WORKSPACE/dependencies -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim_dependencies_install -DSUPERBUILD_ezc3d=ON -DOPENSIM_WITH_CASADI=ON
7272
cmake --build . --config Release -- /maxcpucount:4
7373
7474
- name: Configure opensim-core
@@ -79,7 +79,7 @@ jobs:
7979
# TODO: Can remove /WX when we use that in CMakeLists.txt.
8080
# Set the CXXFLAGS environment variable to turn warnings into errors.
8181
# Skip timing test section included by default.
82-
cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DOPENSIM_WITH_CASADI=on -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.10.11\x64
82+
cmake -E env CXXFLAGS="/WX /MD -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DOPENSIM_WITH_CASADI=on -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.10.11\x64
8383
$env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION
8484
$version = $env:match.split('=')[1]
8585
echo $version
@@ -328,6 +328,7 @@ jobs:
328328
- name: Install Homebrew packages
329329
# Save the gfortran version to a file so we can use it in the cache key.
330330
run: |
331+
brew pin cmake
331332
brew install cmake pkgconfig autoconf libtool automake wget pcre doxygen llvm
332333
brew reinstall gcc
333334
pip3 install numpy==1.25
@@ -362,7 +363,7 @@ jobs:
362363
key: ${{ runner.os }}-dependencies-${{ hashFiles('dependencies/*') }}-${{ hashFiles('gfortran_version/*') }}
363364

364365
- name: Build dependencies
365-
if: steps.cache-dependencies.outputs.cache-hit != 'true'
366+
# if: steps.cache-dependencies.outputs.cache-hit != 'true'
366367
run: |
367368
mkdir $GITHUB_WORKSPACE/../build_deps
368369
cd $GITHUB_WORKSPACE/../build_deps

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ request related to the change, then we may provide the commit.
66

77
This is not a comprehensive list of changes but rather a hand-curated collection of the more notable ones. For a comprehensive history, see the [OpenSim Core GitHub repo](https://github.com/opensim-org/opensim-core).
88

9-
v4.6
10-
====
9+
v4.5.2
10+
======
1111
- The performance of `getStateVariableValue`, `getStateVariableDerivativeValue`, and `getModelingOption` was improved in
1212
the case where provided string is just the name of the value, rather than a path to it (#3782)
1313
- Fixed bugs in `MocoStepTimeAsymmetryGoal::printDescriptionImpl()` where there were missing or incorrect values printed. (#3842)

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include(FeatureSummary)
2929
# ----------------
3030
set(OPENSIM_MAJOR_VERSION 4)
3131
set(OPENSIM_MINOR_VERSION 5)
32-
set(OPENSIM_PATCH_VERSION 1)
32+
set(OPENSIM_PATCH_VERSION 2)
3333

3434
# Don't include the patch version if it is 0.
3535
set(PATCH_VERSION_STRING)

dependencies/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# OpenSim does not use this file directly.
44

55
# We require a version of CMake that supports Visual Studio 2015.
6-
cmake_minimum_required(VERSION 3.5)
6+
cmake_minimum_required(VERSION 3.15)
77

88
project(OpenSimDependencies)
99

0 commit comments

Comments
 (0)