From f5cc0a2f57885d4c653a82fbba36f841014d8002 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 18 Sep 2019 11:04:51 -0600 Subject: [PATCH] gcc compiler flags fixed --- conanfile.py | 2 ++ src/CMakeLists.txt | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8bc19106..8a9d7275 100644 --- a/conanfile.py +++ b/conanfile.py @@ -82,6 +82,8 @@ class UnitsConan(ConanFile): def package_info(self): self.cpp_info.includedirs = ['include'] + if self.settings.compiler == "gcc": + self.cpp_info.cxxflags = ["-fconcepts -Wno-literal-suffix"] def package_id(self): self.info.settings.clear() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f6bd63ce..4a1b2f56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -60,11 +60,13 @@ target_include_directories(units $ $ ) -target_compile_options(units - INTERFACE - -Wno-literal-suffix - -fconcepts -) +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + target_compile_options(units + INTERFACE + -Wno-literal-suffix + -fconcepts + ) +endif() add_library(mp::units ALIAS units) # installation info