cmake - For QT6 require c++17, otherwise for QT5 stay with C++11

NCAR · Apr 6, 2024 · 0fc2f04 · 0fc2f04
1 parent 39e6595
commit 0fc2f04
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/build/cmake/createCMakeLists.py b/build/cmake/createCMakeLists.py
@@ -649,13 +649,23 @@ def writeCMakeListsTop(dir):
     else:
         fo.write('set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC ")\n')
 
+    fo.write('if (Qt5_FOUND)\n')
+    if (options.iscray):
+        fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -hstd=c++11 ")\n')
+    elif (options.isfujitsu):
+        fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++11 -D__fujitsu__ ")\n')        
+    else:
+        fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++11 ")\n')
+    fo.write('else()\n')
     if (options.iscray):
         fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -hstd=c++17 ")\n')
     elif (options.isfujitsu):
         fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 -D__fujitsu__ ")\n')        
     else:
         fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 ")\n')
-
+    fo.write('endif(Qt5_FOUND)\n')
+    fo.write("\n")
+
     if (options.m32):
         fo.write('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 ")\n')
 

diff --git a/codebase/CMakeLists.txt b/codebase/CMakeLists.txt
@@ -117,7 +117,12 @@ endFunction()
 enable_testing()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC ")
+if (Qt5_FOUND)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++11 ")
+else()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 ")
+endif(Qt5_FOUND)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_JASPER_LIB ")
 
 # Set RPATH so that executablefinds lrose libraries without needing LD_LIBRARY_PATH