--- client_server/CMakeLists.txt.orig	2017-04-14 09:26:53 UTC
+++ client_server/CMakeLists.txt
@@ -90,21 +90,21 @@ add_definitions("-D_WEBSOCKETPP_CPP11_ST
 
 # Create the server library
 #link_directories(${UUID_LIBRARY_DIRS})
-add_library(cadabra_server SHARED Server.cc Snoop.cc jsoncpp/jsoncpp.cpp ../core/CdbPython.cc ../core/Stopwatch.cc ../core/ProgressMonitor.cc)
+add_library(cadabra_server SHARED Server.cc Snoop.cc ../core/CdbPython.cc ../core/Stopwatch.cc ../core/ProgressMonitor.cc)
 target_link_libraries(cadabra_server ${Boost_LIBRARIES} ${SNOOP_LIBRARIES} sqlite3 ${PYTHON_LIBRARIES} ${GLIBMM3_LIBRARIES})
 if (WIN32)
    target_link_libraries(cadabra_server ws2_32 mswsock)
 endif()
 
 # Create the client library.
-add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc Snoop.cc jsoncpp/jsoncpp.cpp)
+add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc Snoop.cc)
 target_link_libraries(cadabra_client ${Boost_LIBRARIES} sqlite3 ${PYTHON_LIBRARIES} ${GLIBMM3_LIBRARIES})
 if (WIN32)
    target_link_libraries(cadabra_client ws2_32)
 endif()
 
 # Create server binary
-include_directories("." "./websocketpp" "./jsoncpp")
+include_directories("." "./websocketpp")
 add_executable(cadabra-server cadabra-server.cc)
 add_executable(cadabra2html cadabra2html.cc DataCell.cc)
 add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc)
