diff --git a/cmake/compiler/compiler.cmake b/cmake/compiler/compiler.cmake index 7bdfa24..63c661c 100644 --- a/cmake/compiler/compiler.cmake +++ b/cmake/compiler/compiler.cmake @@ -2,13 +2,13 @@ # compiler.cmake : configure the compilation flags # -message("Compiler id: ${CMAKE_CXX_COMPILER_ID}") +message("Compiler id: ${CMAKE_CXX_COMPILER_ID}") IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - INCLUDE("cmake/compiler/compiler_gnu.cmake") + MESSAGE("Compiler supported") ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - INCLUDE("cmake/compiler/compiler_gnu.cmake") + MESSAGE("Compiler supported") ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - INCLUDE("cmake/compiler/compiler_msvc.cmake") + INCLUDE("cmake/compiler/compiler_msvc.cmake") ELSE() MESSAGE(FATAL_ERROR "Compiler not supported") ENDIF() diff --git a/cmake/compiler/compiler_gnu.cmake b/cmake/compiler/compiler_gnu.cmake deleted file mode 100644 index a37f3ea..0000000 --- a/cmake/compiler/compiler_gnu.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# -# compiler_gnu.cmake : specific configuration for GNU compilers -# - -# Set the flag -Wall to activate all warnings - IF (${CMAKE_BUILD_TYPE} STREQUAL Debug) - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -std=c++14") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall") - - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") - ELSE() - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -std=c++14") - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -O2") - - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") -ENDIF() diff --git a/sqpapp/CMakeLists.txt b/sqpapp/CMakeLists.txt index f88b647..f0c8b80 100644 --- a/sqpapp/CMakeLists.txt +++ b/sqpapp/CMakeLists.txt @@ -59,6 +59,9 @@ QT5_WRAP_UI(UIS_HDRS ADD_EXECUTABLE(${EXECUTABLE_NAME} ${APPLICATION_SOURCES} ${RCC_HDRS} ${UIS_HDRS}) +set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14) +set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) + target_link_libraries(${EXECUTABLE_NAME} ${LIBRARIES}) diff --git a/sqpcore/CMakeLists.txt b/sqpcore/CMakeLists.txt index f4e6fcf..1f3e6de 100644 --- a/sqpcore/CMakeLists.txt +++ b/sqpcore/CMakeLists.txt @@ -27,6 +27,8 @@ FILE (GLOB_RECURSE MODULE_SOURCES ${SOURCES_DIR}/*.h) ADD_LIBRARY(${SQPCORE_LIBRARY_NAME} ${MODULE_SOURCES}) +set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD 14) +set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) TARGET_LINK_LIBRARIES(${SQPCORE_LIBRARY_NAME} ${EXTERN_LIBRARIES}) qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core) diff --git a/sqpgui/CMakeLists.txt b/sqpgui/CMakeLists.txt index 1e768ae..6dd5351 100644 --- a/sqpgui/CMakeLists.txt +++ b/sqpgui/CMakeLists.txt @@ -44,6 +44,8 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}") message(CURRENT INCLUDE : ${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(${SQPGUI_LIBRARY_NAME} ${MODULE_SOURCES} ${UIS_HDRS}) +set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD 14) +set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${EXTERN_LIBRARIES}) qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets)