From 23a077fb773a7781b145312ee3abf684dcab5402 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 6 Jan 2021 19:19:21 +0000 Subject: [PATCH] ECC-1189: Simplify option name --- CMakeLists.txt | 4 ++-- tests/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 514cbf4f0..8f4274f4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ ecbuild_add_option( FEATURE INSTALL_ECCODES_SAMPLES ecbuild_add_option( FEATURE MEMORY_MANAGEMENT DESCRIPTION "Enable memory management" DEFAULT OFF ADVANCED ) ecbuild_add_option( FEATURE ALIGN_MEMORY DESCRIPTION "Enable memory alignment" DEFAULT OFF ADVANCED ) -ecbuild_add_option( FEATURE ECCODES_TIMER DESCRIPTION "Enable timer" DEFAULT OFF ADVANCED ) +ecbuild_add_option( FEATURE TIMER DESCRIPTION "Enable timer" DEFAULT OFF ADVANCED ) ecbuild_add_option( FEATURE ECCODES_THREADS DESCRIPTION "Enable POSIX threads" DEFAULT OFF ADVANCED ) ecbuild_add_option( FEATURE ECCODES_OMP_THREADS DESCRIPTION "Enable OMP threads" DEFAULT OFF ADVANCED ) ecbuild_add_option( FEATURE EXTRA_TESTS DESCRIPTION "Enable extended regression testing" DEFAULT OFF ADVANCED ) @@ -240,7 +240,7 @@ endif() ############################################################################### # other options -if( HAVE_ECCODES_TIMER ) +if( HAVE_TIMER ) set( ECCODES_TIMER 1 ) else() set( ECCODES_TIMER 0 ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3dae75a54..ea8cc44a5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -351,10 +351,10 @@ if( HAVE_BUILD_TOOLS ) COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufr_split_by_rdbSubtype.sh TEST_DEPENDS eccodes_download_bufrs ) - # Performance test. Must have -DENABLE_ECCODES_TIMER=ON + # Performance test. Must have -DENABLE_TIMER=ON ecbuild_add_test( TARGET eccodes_t_grib_ecc-386 TYPE SCRIPT - CONDITION ENABLE_EXTRA_TESTS AND ENABLE_ECCODES_TIMER + CONDITION ENABLE_EXTRA_TESTS AND ENABLE_TIMER COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_ecc-386.sh TEST_DEPENDS eccodes_download_gribs ) else()