Changeset 14555

Timestamp:

Aug 1, 2015, 4:05:02 PM (8 years ago)

Author:

mikedld

Message:

Use CMake-provided C/C++ standard selection capabilities; fix build (qtr.pro)

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• qt/TorrentDelegate.cc (modified) (1 diff)
• qt/qtr.pro (modified) (1 diff)

trunk/CMakeLists.txt

@@ -339 +339 @@
 endif()
 
+if(CMAKE_VERSION VERSION_LESS "3.1")
+    if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+    endif()
+else()
+    set(CMAKE_C_STANDARD 99)
+    set(CMAKE_C_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-
     set(NEEDED_COMPILER_FLAGS
         -Wall

trunk/qt/TorrentDelegate.cc

@@ -286 +286 @@
 {
   QString str;
-  static const QChar ratioSymbol (0x262F);
 
   switch (tor.getActivity ())

trunk/qt/qtr.pro

@@ -56 +56 @@
 FORMS += AboutDialog.ui \
          DetailsDialog.ui \
+         LicenseDialog.ui \
          MainWindow.ui \
          MakeDialog.ui \