diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 4 | ||||
| m--------- | lib/rapidjson | 0 | ||||
| m--------- | lib/yajl | 0 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1a413c1e..35eca5a5 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 @@ -19,3 +19,5 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest) if (CMAKE_VERSION VERSION_LESS 2.8.11) include_directories("${gtest_SOURCE_DIR}/include") endif() + +add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/yajl") diff --git a/lib/rapidjson b/lib/rapidjson new file mode 160000 +Subproject f05edc9296507a9864d99931e203631c2ffd8d4 diff --git a/lib/yajl b/lib/yajl deleted file mode 160000 -Subproject 5e3a7856e643b4d6410ddc3f84bc2f38174f287 |