File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ MESSAGE(STATUS "Found CMake ${CMAKE_VERSION}")
55
66project (SerialPortAssistant)
77
8- set (CMAKE_CXX_STANDARD 17)
8+ # set(CMAKE_CXX_STANDARD 17)
99set (CMAKE_CXX_STANDARD_REQUIRED ON )
1010set (CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "verbose" )
1111# Need qt components
@@ -61,6 +61,14 @@ message("Qt${QT_VERSION_MAJOR}_DIR:${Qt${QT_VERSION_MAJOR}_DIR}")
6161message ("QT_INSTALL_DIR:${QT_INSTALL_DIR} " )
6262message ("QT_LIBRARIES:${QT_LIBRARIES} " )
6363
64+ if (QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6)
65+ set (CMAKE_CXX_STANDARD 17)
66+ set (CMAKE_C_STANDARD 17)
67+ else ()
68+ set (CMAKE_CXX_STANDARD 11)
69+ set (CMAKE_C_STANDARD 11)
70+ endif ()
71+
6472message ("CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH} " )
6573message ("CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH} " )
6674message ("CMAKE_FIND_USE_CMAKE_SYSTEM_PATH:${CMAKE_FIND_USE_CMAKE_SYSTEM_PATH} ; NO_CMAKE_SYSTEM_PATH:${NO_CMAKE_SYSTEM_PATH} " )
You can’t perform that action at this time.
0 commit comments