Skip to content

Commit

Permalink
add RapidJSON
Browse files Browse the repository at this point in the history
  • Loading branch information
vigsterkr committed Apr 17, 2018
1 parent 1c6256f commit d71bda8
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
3 changes: 0 additions & 3 deletions cmake/external/Eigen3.cmake
Expand Up @@ -17,6 +17,3 @@ ExternalProject_Add(
)

add_dependencies(libshogun Eigen3)

UNSET(C_COMPILER)
UNSET(CXX_COMPILER)
16 changes: 16 additions & 0 deletions cmake/external/RapidJSON.cmake
@@ -0,0 +1,16 @@
set(RAPIDJSON_INCLUDE_DIR ${THIRD_PARTY_INCLUDE_DIR}/rapidjson)
include(ExternalProject)
ExternalProject_Add(
RapidJSON
PREFIX ${CMAKE_BINARY_DIR}/RapidJSON
DOWNLOAD_DIR ${THIRD_PARTY_DIR}/RapidJSON
URL https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
URL_MD5 9665844f1fa86b3c6918a743a96b56d9
CMAKE_ARGS -DINCLUDE_INSTALL_DIR:PATH=${RAPIDJSON_INCLUDE_DIR}
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}${CMAKE_DEFINITIONS}
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}${CMAKE_DEFINITIONS}
-DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
)

LIST(APPEND SHOGUN_DEPENDS RapidJSON)
7 changes: 7 additions & 0 deletions src/shogun/CMakeLists.txt
Expand Up @@ -328,6 +328,13 @@ ELSE()
VERSION 0.11)
ENDIF()

# RapidJSON
include(external/RapidJSON)
SHOGUN_INCLUDE_DIRS(SCOPE PUBLIC SYSTEM
$<BUILD_INTERFACE:${RAPIDJSON_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include/shogun/lib/external/eigen>
)

SHOGUN_DEPENDENCIES(
LIBRARY LibXml2
SCOPE PUBLIC
Expand Down

0 comments on commit d71bda8

Please sign in to comment.