# Pastebin ZzCIy1Rd From a8ef1fd5528f20fa8b1807f328045d192f5515ff Mon Sep 17 00:00:00 2001 From: Anna Maniscalco Date: Mon, 1 Dec 2025 19:36:45 +0100 Subject: [PATCH] fixes to build it on my machine --- 3rdparty/glew/CMakeLists.txt | 2 +- frameworks/ngl/src/glslpp/CMakeLists.txt | 2 +- frameworks/ngl/src/v1.0.3/loader/CMakeLists.txt | 2 +- frameworks/oglx/CMakeLists.txt | 2 +- frameworks/testfw/CMakeLists.txt | 2 +- frameworks/testfw/resourcemanager/CMakeLists.txt | 2 +- gfxbench-data/CMakeLists.txt | 2 +- gfxbench/CMakeLists.txt | 2 +- gfxbench40/CMakeLists.txt | 2 +- gfxbench50/src/common/CMakeLists.txt | 2 +- scripts/build-3rdparty.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3rdparty/glew/CMakeLists.txt b/3rdparty/glew/CMakeLists.txt index 8165bd56743c..d8147a9d1971 100644 --- a/3rdparty/glew/CMakeLists.txt +++ b/3rdparty/glew/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 4.0) project(glew) set(VERSION "1.13.0") diff --git a/frameworks/ngl/src/glslpp/CMakeLists.txt b/frameworks/ngl/src/glslpp/CMakeLists.txt index 55dc145e2a8a..c31d29db39fd 100644 --- a/frameworks/ngl/src/glslpp/CMakeLists.txt +++ b/frameworks/ngl/src/glslpp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 4.0) set(LIB_NAME "lib_glsl_pp") project(${LIB_NAME}) diff --git a/frameworks/ngl/src/v1.0.3/loader/CMakeLists.txt b/frameworks/ngl/src/v1.0.3/loader/CMakeLists.txt index ef079906b82d..148e360e194a 100644 --- a/frameworks/ngl/src/v1.0.3/loader/CMakeLists.txt +++ b/frameworks/ngl/src/v1.0.3/loader/CMakeLists.txt @@ -1,7 +1,7 @@ # The name of our project is "VULKAN". CMakeLists files in this project can # refer to the root source directory of the project as ${VULKAN_SOURCE_DIR} and # to the root binary directory of the project as ${VULKAN_BINARY_DIR}. -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 4.0) project (VULKAN) # set (CMAKE_VERBOSE_MAKEFILE 1) diff --git a/frameworks/oglx/CMakeLists.txt b/frameworks/oglx/CMakeLists.txt index 933bd5347454..e246c5e82cdf 100644 --- a/frameworks/oglx/CMakeLists.txt +++ b/frameworks/oglx/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 4.0) if(1) set(OGLX OGLX) # package name = variable prefix. Can be OGLX or scoped package name (a.b.oglx) diff --git a/frameworks/testfw/CMakeLists.txt b/frameworks/testfw/CMakeLists.txt index fd9f665b3014..06d4a7c0b3bb 100644 --- a/frameworks/testfw/CMakeLists.txt +++ b/frameworks/testfw/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 4.0) project(testfw) diff --git a/frameworks/testfw/resourcemanager/CMakeLists.txt b/frameworks/testfw/resourcemanager/CMakeLists.txt index df9dd205742f..0f1b58f2c662 100644 --- a/frameworks/testfw/resourcemanager/CMakeLists.txt +++ b/frameworks/testfw/resourcemanager/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 4.0) project(tfw_deviceinfo) diff --git a/gfxbench-data/CMakeLists.txt b/gfxbench-data/CMakeLists.txt index dee098923044..f97d669d0e97 100644 --- a/gfxbench-data/CMakeLists.txt +++ b/gfxbench-data/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 4.0) project(gfxbench-data) if (NOT OPT_COMMUNITY_BUILD OR BUNDLE_DATA) diff --git a/gfxbench/CMakeLists.txt b/gfxbench/CMakeLists.txt index 62a0b2d18035..4542cb272201 100644 --- a/gfxbench/CMakeLists.txt +++ b/gfxbench/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 4.0) include(VersionParse) version_parse(BENCHMARK ${PRODUCT_VERSION}) diff --git a/gfxbench40/CMakeLists.txt b/gfxbench40/CMakeLists.txt index 75e24cd6e4d8..b40b8a5499c3 100644 --- a/gfxbench40/CMakeLists.txt +++ b/gfxbench40/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 4.0) project(GFXBench) include(VersionParse) diff --git a/gfxbench50/src/common/CMakeLists.txt b/gfxbench50/src/common/CMakeLists.txt index b1ee671f056c..f817f331dae0 100644 --- a/gfxbench50/src/common/CMakeLists.txt +++ b/gfxbench50/src/common/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 4.0) project(gfxb_common) set(COMMON_SRC diff --git a/scripts/build-3rdparty.sh b/scripts/build-3rdparty.sh index 26e1cce7e851..c2838f684ce6 100755 --- a/scripts/build-3rdparty.sh +++ b/scripts/build-3rdparty.sh @@ -69,7 +69,7 @@ fi zlib_OPTS="-DBUILD_SHARED_LIBS=0" libpng_OPTS="-DPNG_STATIC=1 -DPNG_SHARED=0" -poco_OPTS="-DPOCO_STATIC=1 -DDISABLE_MONGODB=1 -DDISABLE_PDF=1 -DDISABLE_DATA=1 -DDISABLE_ZIP=1" +poco_OPTS="-DPOCO_STATIC=1 -DDISABLE_MONGODB=1 -DDISABLE_PDF=1 -DDISABLE_DATA=1 -DDISABLE_ZIP=1 -DDISABLE_OPENSSL=1" glfw_OPTS="-DGLFW_BUILD_EXAMPLES=0 -DGLFW_BUILD_TESTS=0" if [ "$USE_WAYLAND" == "true" ]; then glfw_OPTS+=" -DGLFW_USE_WAYLAND=1 -DGLFW_CLIENT_LIBRARY=glesv2" -- 2.52.0