diff --git a/cmake/external/RapidJSON.cmake b/cmake/external/RapidJSON.cmake index 101f75281bb..b15a64c70b7 100644 --- a/cmake/external/RapidJSON.cmake +++ b/cmake/external/RapidJSON.cmake @@ -5,8 +5,13 @@ ExternalProject_Add( 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 + URL_MD5 badd12c511e081fec6c89c43a7027bce CMAKE_ARGS -DINCLUDE_INSTALL_DIR:PATH=${RAPIDJSON_INCLUDE_DIR} + -DDOC_INSTALL_DIR:PATH=${THIRD_PARTY_INCLUDE_DIR} + -DLIB_INSTALL_DIR:PATH=${THIRD_PARTY_INCLUDE_DIR} + -DRAPIDJSON_BUILD_DOC:BOOL=OFF + -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF + -DRAPIDJSON_BUILD_TESTS:BOOL=OFF -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} diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt index 17b955d9321..b447885d47e 100644 --- a/src/shogun/CMakeLists.txt +++ b/src/shogun/CMakeLists.txt @@ -136,11 +136,6 @@ IF (${USE_GPL_SHOGUN}) target_include_directories(shogun_deps INTERFACE $) ENDIF() -# add bundled libraries to dependency -if(SHOGUN_DEPENDS) - add_dependencies(libshogun ${SHOGUN_DEPENDS}) -endif() - # add target for static library if enabled if (LIBSHOGUN_BUILD_STATIC) add_library(shogun-static STATIC $ ${CMAKE_CURRENT_BINARY_DIR}/lib/config.h) @@ -332,7 +327,7 @@ ENDIF() include(external/RapidJSON) SHOGUN_INCLUDE_DIRS(SCOPE PUBLIC SYSTEM $ - $ + $ ) SHOGUN_DEPENDENCIES( @@ -436,6 +431,10 @@ IF(NOT HAVE_ARC4RANDOM) endif() ENDIF() +# add bundled libraries to dependency +if(SHOGUN_DEPENDS) + add_dependencies(libshogun ${SHOGUN_DEPENDS}) +endif() ################## linker optimisations OPTION(INCREMENTAL_LINKING "Enable incremantal linking")