moved rapidjson to external folder, fixed CMake
This commit is contained in:
Riccardo Spagni
parent
4cd15cdde5
commit
affde29754
25 changed files with 3 additions and 1 deletions
|
|
@ -83,7 +83,6 @@ endif()
|
||||||
# set(BSDI TRUE)
|
# set(BSDI TRUE)
|
||||||
|
|
||||||
include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/version")
|
include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/version")
|
||||||
include_directories(src/common)
|
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
include_directories(SYSTEM /usr/include/malloc)
|
include_directories(SYSTEM /usr/include/malloc)
|
||||||
|
|
@ -136,6 +135,9 @@ endif()
|
||||||
include_directories(${UNBOUND_INCLUDE})
|
include_directories(${UNBOUND_INCLUDE})
|
||||||
link_directories(${UNBOUND_LIBRARY_DIRS})
|
link_directories(${UNBOUND_LIBRARY_DIRS})
|
||||||
|
|
||||||
|
# Final setup for rapidjson
|
||||||
|
include_directories(external/rapidjson)
|
||||||
|
|
||||||
if(MSVC)
|
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__")
|
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")
|
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Dinline=__inline")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue