From b20f76ae9bc6f63e5d8fc69531d0c981b09be0c8 Mon Sep 17 00:00:00 2001 From: Ferdinand Bachmann Date: Wed, 22 Apr 2020 14:58:14 +0200 Subject: [PATCH] fix feature detect try_compile calls --- detect/features.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/detect/features.cmake b/detect/features.cmake index d3fac25..60ecd79 100644 --- a/detect/features.cmake +++ b/detect/features.cmake @@ -1,9 +1,10 @@ try_compile(cxx-least-11 ${CMAKE_BINARY_DIR}/detect ${CMAKE_SOURCE_DIR}/detect/cxxstd.cpp - COMPILE_DEFINITIONS CXX_STANDARD=201103L - CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD} + 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) message(FATAL_ERROR "This library requires at least C++11") endif() @@ -14,8 +15,8 @@ if(cxx-least-11) endif() try_compile(cxx-least-14 ${CMAKE_BINARY_DIR}/detect ${CMAKE_SOURCE_DIR}/detect/cxxstd.cpp - COMPILE_DEFINITIONS CXX_STANDARD=201402L - CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD} + COMPILE_DEFINITIONS -DCXX_STANDARD=201402 + CXX_STANDARD ${CMAKE_CXX_STANDARD} CXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED} CXX_EXTENSIONS ${CMAKE_CXX_EXTENSIONS} )