diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-12-01 21:15:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-12-01 21:15:50 +0200 |
| commit | affde29754c2e2309bec3394c4271c56e3bce18e (patch) | |
| tree | 36f5f1191cb2ee7a18e7411880c09894709864fa /CMakeLists.txt | |
| parent | Merge pull request #1 (diff) | |
| download | monero-affde29754c2e2309bec3394c4271c56e3bce18e.tar.xz | |
moved rapidjson to external folder, fixed CMake
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e994698b1..0e5dfce75 100644 --- 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") |