Update bundled QJson

[apitrace] / thirdparty / qjson / CMakeLists.txt

diff --git a/thirdparty/qjson/CMakeLists.txt b/thirdparty/qjson/CMakeLists.txt
index 14bda2c2dcf2b5cd197c1bd328dd5890c5614e8a..567cb79c3896e647ac8cf464ea36192809852653 100644 (file)
--- a/thirdparty/qjson/CMakeLists.txt
+++ b/thirdparty/qjson/CMakeLists.txt
@@ -1,4 +1,9 @@
-add_definitions (-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG_OUTPUT)
+add_definitions (
+    -DQT_NO_CAST_FROM_ASCII
+    -DQT_NO_CAST_TO_ASCII
+    -DQT_NO_DEBUG_OUTPUT
+    -DQJSON_EXPORT=
+)
 
 set (QT_DONT_USE_QTGUI TRUE)
 
@@ -8,11 +13,19 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR})
 
 set (qjson_MOC_HDRS
     parserrunnable.h
-    serializerrunnable.h
+    #serializerrunnable.h
 )
 
 qt4_wrap_cpp (qjson_MOC_SRCS ${qjson_MOC_HDRS})
 
-set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp)
+set (qjson_SRCS
+    parser.cpp
+    qobjecthelper.cpp
+    json_scanner.cpp
+    json_parser.cc
+    parserrunnable.cpp
+    #serializer.cpp
+    #serializerrunnable.cpp
+)
 
 add_library (qjson_bundled STATIC ${qjson_SRCS} ${qjson_MOC_SRCS})