From a455d3ee7d5ddefcdf008fa86ecc7c80aba758aa Mon Sep 17 00:00:00 2001 From: Rye Date: Mon, 3 Feb 2025 11:35:22 -0500 Subject: Introduce build system and preprocessor support for ARM64 --- indra/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 422927704a..a96545e3a4 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -11,6 +11,8 @@ ## We're not there yet, but once done, there is a kludge in Linking.cmake # "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) +cmake_policy(SET CMP0156 NEW) +cmake_policy(SET CMP0179 NEW) set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING "The root project/makefile/solution name. Defaults to SecondLife.") -- cgit v1.2.3 From fdf404c46165d4faa57678cc3b9ff6af4dda4a01 Mon Sep 17 00:00:00 2001 From: Rye Date: Wed, 20 Aug 2025 18:05:50 -0400 Subject: Speed up build and configure by only generating top level xcode project and enabling dependency buildsystem optimization --- indra/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 69dfe50553..62f8e0ff8b 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -35,6 +35,8 @@ if (NOT DEFINED CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 20) endif() set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_OPTIMIZE_DEPENDENCIES ON) +set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON) include(Variables) include(BuildVersion) -- cgit v1.2.3 From 2b44464a143c3b32ef4d3de4456b100e34ad79ef Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 28 Aug 2025 06:08:13 -0400 Subject: Fix up windows build error in GHA --- indra/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 62f8e0ff8b..455e7980e2 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -10,7 +10,7 @@ ## Nicky: Ideally we want at least 3.21 for good preset support ## We're not there yet, but once done, there is a kludge in Linking.cmake # "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed -cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16.0...4.0 FATAL_ERROR) cmake_policy(SET CMP0156 NEW) cmake_policy(SET CMP0179 NEW) @@ -35,7 +35,13 @@ if (NOT DEFINED CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 20) endif() set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_SCAN_FOR_MODULES OFF) # This slows down build massively + set(CMAKE_OPTIMIZE_DEPENDENCIES ON) + +set(CMAKE_COLOR_DIAGNOSTICS ON) + +# Speeds up cmake generation significantly in some cases set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON) include(Variables) -- cgit v1.2.3