summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2016-05-05 14:11:19 +0100
committerJose Fonseca <jfonseca@vmware.com>2016-05-05 14:11:19 +0100
commitac4cdf379e076c69c7c5ec9d6766362f15968b66 (patch)
tree41cec02bf2f24710a876604e587f4c292ef4be86
parentefc5d91d983a71e8749fe2201a96dc4ca82f4389 (diff)
ubjson: Move into lib.
-rw-r--r--gui/CMakeLists.txt1
-rw-r--r--lib/ubjson/ubjson.hpp (renamed from common/ubjson.hpp)0
-rw-r--r--retrace/CMakeLists.txt1
3 files changed, 2 insertions, 0 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index bcc8cac7..2a3606c9 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -90,6 +90,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
#add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png)
include_directories (
${CMAKE_SOURCE_DIR}/lib/image
+ ${CMAKE_SOURCE_DIR}/lib/ubjson
)
add_executable (qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})
diff --git a/common/ubjson.hpp b/lib/ubjson/ubjson.hpp
index 04c8b08a..04c8b08a 100644
--- a/common/ubjson.hpp
+++ b/lib/ubjson/ubjson.hpp
diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 91f1e3d3..08b086af 100644
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -8,6 +8,7 @@ include_directories (
${CMAKE_BINARY_DIR}/dispatch
${CMAKE_SOURCE_DIR}/dispatch
${CMAKE_SOURCE_DIR}/lib/image
+ ${CMAKE_SOURCE_DIR}/lib/ubjson
${CMAKE_SOURCE_DIR}/thirdparty/dxerr
)