From 268cac0f0f5812149a4b4a0d894a100d711a493c Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Tue, 5 Sep 2017 19:41:45 +0100 Subject: Travis CI testing --- lib/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/CMakeLists.txt') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 35eca5a5..16555dc0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -11,7 +11,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) # Add googletest directly to our build. This defines # the gtest and gtest_main targets. -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest/) +add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/googletest") # The gtest/gtest_main targets carry header search path # dependencies automatically when using CMake 2.8.11 or @@ -20,4 +20,8 @@ if (CMAKE_VERSION VERSION_LESS 2.8.11) include_directories("${gtest_SOURCE_DIR}/include") endif() -add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/yajl") +# include headers for rapidjson, no need to build it +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/include") + +# include header only rapidxml library +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/rapidxml") -- cgit