From 7473b7f42807d9bd125a24d2caab2468e6e9f979 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Wed, 14 Jun 2023 15:29:49 -0300 Subject: [PATCH] build: rename cmake-format settings files --- CMakeLists.txt | 4 ++-- ...{cmake-format-modules.txt => cmake-format-modules.yaml} | 0 build-support/{cmake-format.txt => cmake-format.yaml} | 0 build-support/macros-and-definitions.cmake | 7 ++++--- 4 files changed, 6 insertions(+), 5 deletions(-) rename build-support/{cmake-format-modules.txt => cmake-format-modules.yaml} (100%) rename build-support/{cmake-format.txt => cmake-format.yaml} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6467138af..057b2c5e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,8 +92,8 @@ option(NS3_WARNINGS_AS_ERRORS set(NS3_ENABLED_MODULES "" CACHE STRING "List of modules to enable (e.g. core;network;internet)" ) -set(NS3_DISABLED_MODULES "" - CACHE STRING "List of modules to disable (e.g. lte;wimax)" +set(NS3_DISABLED_MODULES "" CACHE STRING + "List of modules to disable (e.g. lte;wimax)" ) # Filter in the modules from which examples and tests will be built diff --git a/build-support/cmake-format-modules.txt b/build-support/cmake-format-modules.yaml similarity index 100% rename from build-support/cmake-format-modules.txt rename to build-support/cmake-format-modules.yaml diff --git a/build-support/cmake-format.txt b/build-support/cmake-format.yaml similarity index 100% rename from build-support/cmake-format.txt rename to build-support/cmake-format.yaml diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake index 7aac81d38..b0b7e0104 100644 --- a/build-support/macros-and-definitions.cmake +++ b/build-support/macros-and-definitions.cmake @@ -75,7 +75,8 @@ if(WIN32) CACHE BOOL "Precompile module headers to speed up compilation" FORCE ) - # For whatever reason getting M_PI and other math.h definitions from cmath requires this definition + # For whatever reason getting M_PI and other math.h definitions from cmath + # requires this definition # https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=vs-2019 add_definitions(/D_USE_MATH_DEFINES) endif() @@ -589,11 +590,11 @@ macro(process_options) cmake-format COMMAND ${CMAKE_FORMAT_PROGRAM} -c - ${PROJECT_SOURCE_DIR}/build-support/cmake-format.txt -i + ${PROJECT_SOURCE_DIR}/build-support/cmake-format.yaml -i ${INTERNAL_CMAKE_FILES} COMMAND ${CMAKE_FORMAT_PROGRAM} -c - ${PROJECT_SOURCE_DIR}/build-support/cmake-format-modules.txt -i + ${PROJECT_SOURCE_DIR}/build-support/cmake-format-modules.yaml -i ${MODULES_CMAKE_FILES} ) unset(MODULES_CMAKE_FILES)