update: glib.h include path

DSView/CMakeLists.txt

@@ -119,7 +119,7 @@ set(DS_VERSION_MAJOR 1)
 set(DS_VERSION_MINOR 2)
 set(DS_VERSION_MICRO 0)
 set(DS_VERSION_STRING
-	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
+	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} RC1
 )
 
 configure_file (

DSView/clean

@@ -0,0 +1,13 @@
+echo "rm cmake cache begin..."
+rm ./cmake_install.cmake
+rm -r ./CMakeFiles
+rm ./Makefile
+rm ./CMakeCache.txt
+rm ./*.cmake
+rm ./DSView
+rm ./DSView.qrc.depends
+sudo rm ./install_manifest.txt
+
+find . -name 'moc_*.cpp*' | xargs rm -rf
+find . -name 'qrc_*.cpp' | xargs rm -rf
+echo "rm cmake cache end..."

DSView/config.h

@@ -29,6 +29,6 @@
 #define DS_VERSION_MAJOR 1
 #define DS_VERSION_MINOR 2
 #define DS_VERSION_MICRO 0
-#define DS_VERSION_STRING "1.2.0"
+#define DS_VERSION_STRING "1.2.0;RC1"
 
 #endif

DSView/pv/data/decode/decoder.h

@@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
   
-#include <glib.h>
+#include <glib-2.0/glib.h>
 
 struct srd_decoder;
 struct srd_decoder_inst;

DSView/pv/device/devinst.h

@@ -25,7 +25,7 @@
 #include <QObject>
 
 #include <string>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <stdint.h>
 
 #include <libsigrok4DSL/libsigrok.h>

DSView/pv/devicemanager.h

@@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_DEVICEMANAGER_H
 #define DSVIEW_PV_DEVICEMANAGER_H
 
-#include <glib.h>
+#include <glib-2.0/glib.h>
 
 #include <list>
 #include <map>

DSView/pv/mainwindow.cpp

@@ -86,7 +86,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <list>
 #include "ui/msgbox.h"
 #include "config/appconfig.h"

DSView/pv/prop/binding/binding.h

@@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_PROP_BINDING_BINDING_H
 #define DSVIEW_PV_PROP_BINDING_BINDING_H
 
-#include <glib.h>
+#include <glib-2.0/glib.h>
 
 #include <vector>
 #include <map> 

DSView/pv/prop/property.h

@@ -23,7 +23,7 @@
 #ifndef DSVIEW_PV_PROP_PROPERTY_H
 #define DSVIEW_PV_PROP_PROPERTY_H
 
-#include <glib.h>
+#include <glib-2.0/glib.h>
 
 #include <boost/function.hpp>