diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-12-01 21:25:41 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-12-01 21:25:54 +0200 |
| commit | e1555fdf8b9e83c46857e2252494840916b69c22 (patch) | |
| tree | 36f5f1191cb2ee7a18e7411880c09894709864fa /CMakeLists.txt | |
| parent | Merge pull request #191 (diff) | |
| parent | moved rapidjson to external folder, fixed CMake (diff) | |
| download | monero-e1555fdf8b9e83c46857e2252494840916b69c22.tar.xz | |
Merge pull request #192
affde29 moved rapidjson to external folder, fixed CMake (Riccardo Spagni)
f1eaf88 Prints seed after wallet upgrade. Removed iostream include. (Oran Juice)
70971be Doxygen comments (Oran Juice)
031ca23 Rewrites to old wallet file correctly (Oran Juice)
1f833dc Doxygen comments in (Oran Juice)
0bd88ff Writes seed language while generating wallet. Wallet open fix. (Oran Juice)
09a659e Stores seed language in wallet file. added rapidjson. Yet to test backward compatibility (Oran Juice)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ee7bebdd9..0e5dfce75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,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") |