diff --git a/.gitignore b/.gitignore
index 6ffd637..d562403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,8 @@ proto/**/*.pb.cc
 proto/**/*.pb.h
 default.etcd/
 
+# vscode
+.vscode/
+
 # vscode-clangd
 .cache/
diff --git a/etcd-cpp-api-config.in.cmake b/etcd-cpp-api-config.in.cmake
index c1a9047..c12b748 100644
--- a/etcd-cpp-api-config.in.cmake
+++ b/etcd-cpp-api-config.in.cmake
@@ -15,9 +15,11 @@ if(NOT gRPC_FOUND)
     find_dependency(GRPC)
 endif()
 
-find_dependency(cpprestsdk)
-if(cpprestsdk_FOUND)
-    set(CPPREST_LIB cpprestsdk::cpprest)
+if (NOT @BUILD_ETCD_CORE_ONLY@)
+    find_dependency(cpprestsdk)
+    if(cpprestsdk_FOUND)
+        set(CPPREST_LIB cpprestsdk::cpprest)
+    endif()
 endif()
 
 set(ETCD_CPP_HOME "${CMAKE_CURRENT_LIST_DIR}/../../..")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 19687db..ddeed34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,10 @@ file(GLOB_RECURSE CPP_CLIENT_CORE_SRC
                   "${CMAKE_CURRENT_SOURCE_DIR}/**/*.cpp"
 )
 
+if(BUILD_ETCD_CORE_ONLY)
+    list(REMOVE_ITEM CPP_CLIENT_CORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/Client.cpp")
+endif()
+
 add_library(etcd-cpp-api-core-objects OBJECT ${CPP_CLIENT_CORE_SRC} ${PROTOBUF_GENERATES})
 use_cxx(etcd-cpp-api-core-objects)
 set_exceptions(etcd-cpp-api-core-objects)