From 54f9f185e2c8cf3e9d66c7a4a27f97c10f818018 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 3 Oct 2021 14:13:02 +0100 Subject: [PATCH] Add compile options and put Qt definitions in app CMakeLists --- CMakeLists.txt | 20 ++++++++------------ app/CMakeLists.txt | 8 ++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab1f497..58c3798 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,10 +217,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # #################################################################################################################################################### SET(CMAKE_CXX_STANDARD 20) -IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) - ADD_DEFINITIONS(-std=gnu++2a) +SET(CMAKE_CXX_STANDARD_REQUIRED ON) +IF(MSVC) + ADD_COMPILE_OPTIONS(/std:c++20) ELSE() - ADD_DEFINITIONS(-std=c++20) + IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) + ADD_DEFINITIONS(-std=gnu++2a) + ELSE() + ADD_DEFINITIONS(-std=c++20) + ENDIF() ENDIF() IF(NOT CMAKE_BUILD_TYPE) @@ -230,19 +235,10 @@ ENDIF() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -funroll-loops") -ADD_DEFINITIONS( - -DQT_NO_CAST_TO_ASCII - # -DQT_NO_CAST_FROM_ASCII - -DQT_NO_URL_CAST_FROM_STRING - -DQT_NO_CAST_FROM_BYTEARRAY - # -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_QSTRINGBUILDER -) - # if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") endif() IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wlogical-op") - # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") ENDIF() IF(USE_WERROR) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 4f96dcf..20cb2cd 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -36,6 +36,14 @@ IF(USE_QTDBUS) ENDIF() ENDIF() +ADD_DEFINITIONS( + -DQT_NO_CAST_TO_ASCII + # -DQT_NO_CAST_FROM_ASCII + -DQT_NO_URL_CAST_FROM_STRING + -DQT_NO_CAST_FROM_BYTEARRAY + # -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_QSTRINGBUILDER +) + SET(Calyp_App_SRCS # Main main.cpp