From 4c089e0d0a87daa52cd603b175ba11a5cc7c455a Mon Sep 17 00:00:00 2001 From: Seth Parker Date: Mon, 24 Jun 2024 11:20:57 -0400 Subject: [PATCH] Export CMake cache variable with the to_numeric-check results for downstream, header-only projects --- CMakeLists.txt | 2 +- cmake/CheckToNumericFP.cmake | 4 ++-- include/educelab/core/utils/String.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fdb5f7..54bb08e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) -project(EduceLabCore VERSION 0.2.0) +project(EduceLabCore VERSION 0.2.1) # Setup project directories set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) diff --git a/cmake/CheckToNumericFP.cmake b/cmake/CheckToNumericFP.cmake index 2f104e5..9becb02 100644 --- a/cmake/CheckToNumericFP.cmake +++ b/cmake/CheckToNumericFP.cmake @@ -15,6 +15,6 @@ if(CXX_CHARCONV_FP_FROM_CHARS) message(STATUS "Float implementation for to_numeric: std::from_chars") else() message(STATUS "Float implementation for to_numeric: std::sto[f|d|ld]") - set(EDUCELAB_NEED_TO_NUMERIC_FP TRUE) - add_compile_definitions(EDUCELAB_NEED_TO_NUMERIC_FP) + set(EDUCE_CORE_NEED_TO_NUMERIC_FP TRUE CACHE BOOL "Float implementations for to_numeric will use std::sto[f|d|ld]") + add_compile_definitions(EDUCE_CORE_NEED_TO_NUMERIC_FP) endif() \ No newline at end of file diff --git a/include/educelab/core/utils/String.hpp b/include/educelab/core/utils/String.hpp index ab2d20b..24a99a8 100644 --- a/include/educelab/core/utils/String.hpp +++ b/include/educelab/core/utils/String.hpp @@ -223,7 +223,7 @@ auto to_numeric(const std::string_view str, Args... args) -> T return val; } -#ifdef EDUCELAB_NEED_TO_NUMERIC_FP +#ifdef EDUCE_CORE_NEED_TO_NUMERIC_FP /** * @copybrief to_numeric *