[Kst] branches/work/kst/portto4/kst

Peter Kümmel syntheticpp at gmx.net
Sat Jun 1 14:24:01 UTC 2013


SVN commit 1356713 by kuemmel:

build with Clang

 M  +5 -0      CMakeLists.txt  
 M  +2 -1      cmake/CMakeLists.txt  
 M  +2 -0      cmake/src/libkst/CMakeLists.txt  
 M  +1 -0      src/libkstapp/document.cpp  


--- branches/work/kst/portto4/kst/CMakeLists.txt #1356712:1356713
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 2.8)
 
+if(kst_clang)
+    set(CMAKE_C_COMPILER   "clang"   CACHE PATH "Clang C compiler")
+    set(CMAKE_CXX_COMPILER "clang++" CACHE PATH "Clang C++ compiler")
+endif()
+
 project(Kst)
 
 add_subdirectory(cmake)
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1356712:1356713
@@ -44,6 +44,7 @@
 kst_option(string ""  all qt5               "Use Qt5")
 kst_option(bool   ON  all qt5base_only      "Only use Qt5 features available in qtbase")
 kst_option(bool   ON  all opengl            "Use OpenGL")
+kst_option(bool   OFF all clang             "Use Clang compiler")
 
 message(STATUS)
 
@@ -249,7 +250,7 @@
 	set(kst_win32 MACOSX_BUNDLE)
 endif()
 
-if(APPLE)
+if(APPLE OR kst_clang)
 	set(kst_pch 0 CACHE BOOL "Disable pch on Mac, not supported yet" FORCE)
 endif()
 
--- branches/work/kst/portto4/kst/cmake/src/libkst/CMakeLists.txt #1356712:1356713
@@ -7,8 +7,10 @@
 if(WIN32 OR APPLE OR QNX OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 	kst_files_ignore(sysinfo psversion)
 else()
+    if(NOT kst_clang)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lrt")
 endif()
+endif()
 
 kst_files_find(src/libkst)
 
--- branches/work/kst/portto4/kst/src/libkstapp/document.cpp #1356712:1356713
@@ -27,6 +27,7 @@
 
 #include <QDebug>
 #include <QFile>
+#include <QDir>
 #include <QXmlStreamReader>
 
 


More information about the Kst mailing list