moved rapidjson to external folder, fixed CMake

2014-12-01 21:15:50 +02:00 · 2014-12-01 21:15:50 +02:00 · affde29754
commit affde29754
parent 4cd15cdde5
25 changed files with 3 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -83,7 +83,6 @@ endif()
 #   set(BSDI TRUE)

 include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/version")
-include_directories(src/common)

 if(APPLE)
  include_directories(SYSTEM /usr/include/malloc)
@ -136,6 +135,9 @@ endif()
 include_directories(${UNBOUND_INCLUDE})
 link_directories(${UNBOUND_LIBRARY_DIRS})

+# Final setup for rapidjson
+include_directories(external/rapidjson)
+
 if(MSVC)
  add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /FIinline_c.h /D__SSE4_1__")
  # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Dinline=__inline")
--- a/src/common/rapidjson/allocators.h
+++ b/src/common/rapidjson/allocators.h
--- a/src/common/rapidjson/document.h
+++ b/src/common/rapidjson/document.h
--- a/src/common/rapidjson/encodedstream.h
+++ b/src/common/rapidjson/encodedstream.h
--- a/src/common/rapidjson/encodings.h
+++ b/src/common/rapidjson/encodings.h
--- a/src/common/rapidjson/error/en.h
+++ b/src/common/rapidjson/error/en.h
--- a/src/common/rapidjson/error/error.h
+++ b/src/common/rapidjson/error/error.h
--- a/src/common/rapidjson/filereadstream.h
+++ b/src/common/rapidjson/filereadstream.h
--- a/src/common/rapidjson/filestream.h
+++ b/src/common/rapidjson/filestream.h
--- a/src/common/rapidjson/filewritestream.h
+++ b/src/common/rapidjson/filewritestream.h
--- a/src/common/rapidjson/internal/dtoa.h
+++ b/src/common/rapidjson/internal/dtoa.h
--- a/src/common/rapidjson/internal/itoa.h
+++ b/src/common/rapidjson/internal/itoa.h
--- a/src/common/rapidjson/internal/meta.h
+++ b/src/common/rapidjson/internal/meta.h
--- a/src/common/rapidjson/internal/pow10.h
+++ b/src/common/rapidjson/internal/pow10.h
--- a/src/common/rapidjson/internal/stack.h
+++ b/src/common/rapidjson/internal/stack.h
--- a/src/common/rapidjson/internal/strfunc.h
+++ b/src/common/rapidjson/internal/strfunc.h
--- a/src/common/rapidjson/memorybuffer.h
+++ b/src/common/rapidjson/memorybuffer.h
--- a/src/common/rapidjson/memorystream.h
+++ b/src/common/rapidjson/memorystream.h
--- a/src/common/rapidjson/msinttypes/inttypes.h
+++ b/src/common/rapidjson/msinttypes/inttypes.h
--- a/src/common/rapidjson/msinttypes/stdint.h
+++ b/src/common/rapidjson/msinttypes/stdint.h
--- a/src/common/rapidjson/prettywriter.h
+++ b/src/common/rapidjson/prettywriter.h
--- a/src/common/rapidjson/rapidjson.h
+++ b/src/common/rapidjson/rapidjson.h
--- a/src/common/rapidjson/reader.h
+++ b/src/common/rapidjson/reader.h
--- a/src/common/rapidjson/stringbuffer.h
+++ b/src/common/rapidjson/stringbuffer.h
--- a/src/common/rapidjson/writer.h
+++ b/src/common/rapidjson/writer.h