From bf2fee7d71f1c537149ef9bedaf715bdb24cf918 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 31 Mar 2025 22:30:31 +0200 Subject: [PATCH] Submodule updates (#3586) Update submodules and also provide compatibility with CMake 4.0. - assimp: `v5.4.1` -> `v5.4.3` - catch: `v3.5.3` -> `3.8.0` - date: `master` -> `v3.0.3` - freetype2: `v2.10.4` -> `v2.13.3`. Also change to freetypes original Git server - glbindings: `v3.3.0` -> `v3.4.0` - glm: `master` -> `v1.0.2` - scnlib: `v4.0.1` -> `v2.0.2` - soloud: `master` -> `master` - tinyxml: `master` -> `v11.0.0` - tracy: `v0.10.1` -> `v0.11.0` --- CMakeLists.txt | 6 ++++++ apps/OpenSpace/ext/sgct | 2 +- ext/date | 2 +- ext/ghoul | 2 +- modules/audio/ext/soloud | 2 +- modules/fitsfilereader/ext/CCfits | 2 +- modules/fitsfilereader/ext/cfitsio | 2 +- modules/kameleon/ext/kameleon | 2 +- modules/webbrowser/CMakeLists.txt | 2 +- 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d4304ad6d..32390f3be2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,12 @@ cmake_policy(VERSION 3.25) project(OpenSpace) +# CMake 4.0 will no longer allow minimum required version below 3.5 and some of our +# dependencies have not been updated to reflect this. To make things work, we blanked +# require to 3.10 here to remove those issues. Once CMake configures and generates +# successfully without this next line, it can be removed +set(CMAKE_POLICY_VERSION_MINIMUM 3.10) + set(OPENSPACE_RELEASE_BUILD OFF) set(OPENSPACE_VERSION_MAJOR) set(OPENSPACE_VERSION_MINOR) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 1418d9beb2..7ac1bd4891 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 1418d9beb25ad325f9e9e831acee22317e6b2578 +Subproject commit 7ac1bd4891efb2e34f6574a26e591d4a984e8e6b diff --git a/ext/date b/ext/date index 569b2d6785..5bdb7e6f31 160000 --- a/ext/date +++ b/ext/date @@ -1 +1 @@ -Subproject commit 569b2d678547985d0ead3b73ee93a28919000887 +Subproject commit 5bdb7e6f31fac909c090a46dbd9fea27b6e609a4 diff --git a/ext/ghoul b/ext/ghoul index 2972e7b963..8d73afb420 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 2972e7b963abe1a0ddd57efd8aaf28840a8da37e +Subproject commit 8d73afb420eee59881df53ee3dba998fbeaec595 diff --git a/modules/audio/ext/soloud b/modules/audio/ext/soloud index 1157475881..e82fd32c1f 160000 --- a/modules/audio/ext/soloud +++ b/modules/audio/ext/soloud @@ -1 +1 @@ -Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57 +Subproject commit e82fd32c1f62183922f08c14c814a02b58db1873 diff --git a/modules/fitsfilereader/ext/CCfits b/modules/fitsfilereader/ext/CCfits index 15e78f599d..d9f9811b3e 160000 --- a/modules/fitsfilereader/ext/CCfits +++ b/modules/fitsfilereader/ext/CCfits @@ -1 +1 @@ -Subproject commit 15e78f599dcf619a573cc011e32b2635be9bf3dc +Subproject commit d9f9811b3ef639d4d185385dc9b6cefe7f722c59 diff --git a/modules/fitsfilereader/ext/cfitsio b/modules/fitsfilereader/ext/cfitsio index 8d98f1495b..49258f81de 160000 --- a/modules/fitsfilereader/ext/cfitsio +++ b/modules/fitsfilereader/ext/cfitsio @@ -1 +1 @@ -Subproject commit 8d98f1495b8c762f1c56e79da33cbd3c7d623d80 +Subproject commit 49258f81ded8e78bc2bcc74fab44770c822b32b6 diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon index eee25cf7f4..91485053e1 160000 --- a/modules/kameleon/ext/kameleon +++ b/modules/kameleon/ext/kameleon @@ -1 +1 @@ -Subproject commit eee25cf7f4d06dc72fd057326cf6b337a4df8e24 +Subproject commit 91485053e1c260b337d1a9fd770c441abc0aa4a1 diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt index fac4e9a432..51e6610443 100644 --- a/modules/webbrowser/CMakeLists.txt +++ b/modules/webbrowser/CMakeLists.txt @@ -38,7 +38,7 @@ set(PROJECT_ARCH "x86_64") # reserved. Use of this source code is governed by a BSD-style license that # can be found in the LICENSE file. -cmake_minimum_required(VERSION 2.8.12.1) +cmake_minimum_required(VERSION 3.10) # Use folders in the resulting project files. set_property(GLOBAL PROPERTY OS_FOLDERS ON)