Remove json submodule

constantinpape · Nov 27, 2018 · 9587aa4 · 9587aa4
1 parent f37f714
commit 9587aa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,18 +66,18 @@ option(BUILD_TESTS OFF)
 
 
 ###############################
-# Include git submodules
+# Include gtest submodule
 ###############################
 
+# NOTE I tried to replace thhis with the conda package and
+# use find_pacakge(GTest), but although CMake could find the
+# libraries, this led to horrible linker errors
 if(BUILD_TESTS)
     # add gtest external project and include the directories
     add_subdirectory(external/googletest/googletest)
     include_directories(${gtest_SOURCE_DIR/include} ${gtest_SOURCE_DIR})
 endif()
 
-# include json external library
-include_directories(${CMAKE_SOURCE_DIR}/external/json/include)
-
 
 ###############################
 # Set up conda env

diff --git a/external/json b/external/json