Skip to content

Upgrade CMake to v4#802

Merged
davidhjp01 merged 31 commits into
bugfix/800-ci-builds-failingfrom
cmake-v4
May 18, 2026
Merged

Upgrade CMake to v4#802
davidhjp01 merged 31 commits into
bugfix/800-ci-builds-failingfrom
cmake-v4

Conversation

@davidhjp01

@davidhjp01 davidhjp01 commented May 15, 2026

Copy link
Copy Markdown
Contributor

Upgrade CMake to v4

@davidhjp01 davidhjp01 requested a review from kyllingstad May 15, 2026 14:34
@davidhjp01 davidhjp01 marked this pull request as draft May 15, 2026 14:38
@davidhjp01 davidhjp01 changed the title Fix Windows Debug build, and support MSVC C++20 Upgrade CMake to v4 May 15, 2026
@davidhjp01 davidhjp01 marked this pull request as ready for review May 15, 2026 18:42
Comment thread conanfile.py Outdated
self.requires("boost/[~1.85]", transitive_headers=True, transitive_libs=True) # Required by Thrift
if self.options.proxyfmu:
self.requires("proxyfmu/0.4.1@osp/stable",
self.requires("proxyfmu/0.4.1@osp/testing-cmake-v4",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this should be reverted before merging.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will updated it to stable version after releasing proxyfmu

Comment thread .github/workflows/ci-conan.yml Outdated
apt-get update
apt-get install -y pipx cmake doxygen
pipx install conan
pipx install conan cmake

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary? It seems strange to install CMake via the Python package system. Won't CMake be installed by Conan due to the tool_requires() directive in conanfile.py?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I thought so too, but since it was originally installing conan via apt, I just moved it here for updating it to the latest version. I can try removing it

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also try removing the APT install, so we are sure it's using the Conan-installed one.

@davidhjp01 davidhjp01 merged commit 6c9ce1f into bugfix/800-ci-builds-failing May 18, 2026
20 checks passed
@davidhjp01 davidhjp01 deleted the cmake-v4 branch May 18, 2026 06:59
kyllingstad added a commit that referenced this pull request May 18, 2026
This fixes #800 by making changes to the Conan+Linux CI
workflow. The official Conan Center docker image we were using has
now been deprecated (all of them have), so I have switched to using
the official GCC image instead. This required a GCC version upgrade.
The oldest supported version is 12, but I went with 14 so we can stay
on the same version for a while. (GCC 15 is the newest, at the time
of writing.)

I also replaced the roundabout process we had of generating our own
Docker image to using Github Actions' built-in facilities for choosing
an image.

This also fixes #798 by updating the Conan options syntax for both
Conan workflows, and updates the build system to use CMake 4
(#802, thanks to @davidhjp01).

---------

Co-authored-by: David Heejong Park <88651540+davidhjp01@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants