From 5877db5411191653e1c5bd3119c4204e34f105e0 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Tue, 31 Mar 2026 22:20:41 +0200 Subject: [PATCH] Move NO_ISA_EXTENSIONS option to config.cmake. --- capture/CMakeLists.txt | 1 - cmake/config.cmake | 4 ++++ csvexport/CMakeLists.txt | 2 -- import/CMakeLists.txt | 1 - merge/CMakeLists.txt | 1 - monitor/CMakeLists.txt | 2 -- profiler/CMakeLists.txt | 1 - update/CMakeLists.txt | 2 -- 8 files changed, 4 insertions(+), 10 deletions(-) diff --git a/capture/CMakeLists.txt b/capture/CMakeLists.txt index 0fa03f97..11869061 100644 --- a/capture/CMakeLists.txt +++ b/capture/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.16) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) set(NO_STATISTICS ON) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake) diff --git a/cmake/config.cmake b/cmake/config.cmake index e5a18790..89635e9c 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -1,3 +1,7 @@ +include(${CMAKE_CURRENT_LIST_DIR}/options.cmake) + +set_option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) + if (NOT NO_ISA_EXTENSIONS) include(CheckCXXCompilerFlag) if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") diff --git a/csvexport/CMakeLists.txt b/csvexport/CMakeLists.txt index ed10dc34..da9410c1 100644 --- a/csvexport/CMakeLists.txt +++ b/csvexport/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 3.16) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) - set(NO_STATISTICS OFF) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake) diff --git a/import/CMakeLists.txt b/import/CMakeLists.txt index 58d96204..e675cb2a 100644 --- a/import/CMakeLists.txt +++ b/import/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.16) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) set(NO_STATISTICS ON) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake) diff --git a/merge/CMakeLists.txt b/merge/CMakeLists.txt index b5fac838..4be5ebda 100644 --- a/merge/CMakeLists.txt +++ b/merge/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.16) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) set(NO_STATISTICS OFF) # we need those to get processed source zone locations include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake) diff --git a/monitor/CMakeLists.txt b/monitor/CMakeLists.txt index 65c0be83..988cd667 100644 --- a/monitor/CMakeLists.txt +++ b/monitor/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.16) set(TRACY_PUBLIC_DIR ${CMAKE_CURRENT_LIST_DIR}/../public) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) - include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake) set(CMAKE_CXX_STANDARD 17) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 40d6913a..a5f01e0e 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.25) option(NO_FILESELECTOR "Disable the file selector" OFF) option(GTK_FILESELECTOR "Use the GTK file selector on Linux instead of the xdg-portal one" OFF) option(LEGACY "Instead of Wayland, use the legacy X11 backend on Linux" OFF) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) option(NO_STATISTICS "Disable calculation of statistics" OFF) option(SELF_PROFILE "Enable self-profiling" OFF) set(SANITIZE "" CACHE STRING "Sanitizer parameters") diff --git a/update/CMakeLists.txt b/update/CMakeLists.txt index 92d694ab..d4e8e6f8 100644 --- a/update/CMakeLists.txt +++ b/update/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 3.16) -option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF) - set(NO_STATISTICS ON) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)