From 82034a87dbe07cc6effad8340a904dd1d5f2f4b8 Mon Sep 17 00:00:00 2001
From: arches <luisa.arches@nokia.com>
Date: Wed, 13 Jul 2016 05:54:27 -0400
Subject: [PATCH] Updated makefiles

---
 CMakeLists.txt     | 8 ++++----
 src/CMakeLists.txt | 2 ++
 tst/CMakeLists.txt | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa1e223..c917983 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,17 +2,17 @@ cmake_minimum_required (VERSION 3.1.3 FATAL_ERROR)
 project (etcd-cpp-api)
 
 find_library(CPPREST_LIB NAMES cpprest)
+find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h)
+
 find_package(Boost REQUIRED COMPONENTS system thread locale random)
-find_package(Protobuf REQUIRED)
 
 set (etcd-cpp-api_VERSION_MAJOR 0)
 set (etcd-cpp-api_VERSION_MINOR 1)
 
 enable_testing()
-
+include_directories(SYSTEM ${CPPREST_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
-
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wpedantic -Werror -std=c++11")
 
 add_subdirectory(src)
 add_subdirectory(tst)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f7567b..183a0fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,9 @@ target_link_libraries(etcd-cpp-api ${CPPREST_LIB} boost_system ssl crypto protob
 
 install (TARGETS etcd-cpp-api DESTINATION lib)
 install (FILES ../etcd/Client.hpp
+               ../etcd/SyncClient.hpp
                ../etcd/Response.hpp
                ../etcd/Value.hpp
+               ../etcd/Watcher.hpp
                DESTINATION include/etcd)
 
diff --git a/tst/CMakeLists.txt b/tst/CMakeLists.txt
index 50083cc..e0ce264 100644
--- a/tst/CMakeLists.txt
+++ b/tst/CMakeLists.txt
@@ -1,3 +1,6 @@
+find_path(CATCH_INCLUDE_DIR NAMES catch.hpp)
+include_directories(${CATCH_INCLUDE_DIR})
+
 add_executable(etcd_test EtcdTest.cpp EtcdSyncTest.cpp WatcherTest.cpp)
 set_property(TARGET etcd_test PROPERTY CXX_STANDARD 11)