From 3bad408674b7c8911d40382c93cc0aa0062dc1af Mon Sep 17 00:00:00 2001 From: Ferdinand Bachmann Date: Mon, 12 May 2025 14:17:15 +0200 Subject: [PATCH] CMake: detect/features.cmake: fix try_compile if CXX_STANDARD or CXX_EXTENSIONS unset --- detect/features.cmake | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/detect/features.cmake b/detect/features.cmake index 60ecd79..7f0cb25 100644 --- a/detect/features.cmake +++ b/detect/features.cmake @@ -1,8 +1,5 @@ try_compile(cxx-least-11 ${CMAKE_BINARY_DIR}/detect ${CMAKE_SOURCE_DIR}/detect/cxxstd.cpp COMPILE_DEFINITIONS -DCXX_STANDARD=201103 - CXX_STANDARD ${CMAKE_CXX_STANDARD} - CXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED} - CXX_EXTENSIONS ${CMAKE_CXX_EXTENSIONS} ) if(NOT cxx-least-11) @@ -16,20 +13,13 @@ endif() try_compile(cxx-least-14 ${CMAKE_BINARY_DIR}/detect ${CMAKE_SOURCE_DIR}/detect/cxxstd.cpp COMPILE_DEFINITIONS -DCXX_STANDARD=201402 - CXX_STANDARD ${CMAKE_CXX_STANDARD} - CXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED} - CXX_EXTENSIONS ${CMAKE_CXX_EXTENSIONS} ) if(cxx-least-14) set(RING_BUFFER_CONSTEXPR ON) message(STATUS "Enabling RING_BUFFER_CONSTEXPR (C++14 and up)") endif() -try_compile(constexpr-destructors-compile ${CMAKE_BINARY_DIR}/detect ${CMAKE_SOURCE_DIR}/detect/constexpr_destructors.cpp - CXX_STANDARD ${CMAKE_CXX_STANDARD} - CXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED} - CXX_EXTENSIONS ${CMAKE_CXX_EXTENSIONS} -) +try_compile(constexpr-destructors-compile ${CMAKE_BINARY_DIR}/detect ${CMAKE_SOURCE_DIR}/detect/constexpr_destructors.cpp) if(constexpr-destructors-compile) set(RING_BUFFER_CONSTEXPR_DESTRUCTORS ON) message(STATUS "Enabling RING_BUFFER_CONSTEXPR_DESTRUCTORS (C++20 and up)")