diff --git a/CMakeLists.txt b/CMakeLists.txt
index c736ccb..0fa98c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ option(BUILD_BENCHMARKS "Build benchmarks" ON)
 option(BUILD_EXAMPLES "Build examples" ON)
 option(BUILD_TESTS "Build tests" ON)
 
-enable_testing()
+#enable_testing()
 
 include(ExternalProject)
 include(CTest)
@@ -177,7 +177,9 @@ endif()
 
 if("${BUILD_TYPE_LOWER}" MATCHES "debug")
   message("debug mode was set")
+  if (NOT WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unreachable-code")
+  endif()
 else()
   message("release mode was set")
 endif()
@@ -186,18 +188,22 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(TEST_CXX_FLAGS ${TEST_CXX_FLAGS} -Wno-inconsistent-missing-override)
 endif()
 
-find_library(DOUBLE-CONVERSION double-conversion)
+find_package(double-conversion CONFIG REQUIRED)
 
 find_package(OpenSSL REQUIRED)
 
-find_package(Gflags REQUIRED)
+find_package(gflags CONFIG REQUIRED)
+set(gflags gflags::gflags)
 
 # find glog::glog to satisfy the folly dep.
-find_package(Glog REQUIRED)
+find_package(glog CONFIG REQUIRED)
+find_package(folly CONFIG REQUIRED)
+find_package(ZLIB REQUIRED)
 
 find_package(fmt CONFIG REQUIRED)
 
-include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
+
+#
 
 include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
 
@@ -332,7 +338,7 @@ target_compile_options(
   ReactiveSocket
   PRIVATE ${EXTRA_CXX_FLAGS})
 
-enable_testing()
+#enable_testing()
 
 install(TARGETS ReactiveSocket EXPORT rsocket-exports DESTINATION lib)
 install(DIRECTORY rsocket DESTINATION include FILES_MATCHING PATTERN "*.h")
@@ -475,7 +481,7 @@ if(BUILD_TESTS)
     ${GMOCK_LIBS}  # This also needs the preceding `add_dependencies`
     glog::glog
     gflags
-    ${DOUBLE-CONVERSION})
+    double-conversion::double-conversion)
 
 # Download the latest TCK drivers JAR.
   set(TCK_DRIVERS_JAR rsocket-tck-drivers-0.9.10.jar)
diff --git a/yarpl/CMakeLists.txt b/yarpl/CMakeLists.txt
index f4159b8..65974e3 100644
--- a/yarpl/CMakeLists.txt
+++ b/yarpl/CMakeLists.txt
@@ -10,7 +10,6 @@ set(CMAKE_MODULE_PATH
 )
 
 add_definitions(-std=c++14)
-option(BUILD_TESTS "BUILD_TESTS" ON)
 
 # Generate compilation database
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
@@ -53,8 +52,8 @@ endif()
 # Using NDEBUG in Release builds.
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
 
-find_package(Gflags REQUIRED)
-find_package(Glog REQUIRED)
+#find_package(Gflags REQUIRED)
+#find_package(Glog REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 
 IF(NOT FOLLY_VERSION)
@@ -125,7 +124,7 @@ target_link_libraries(
   yarpl
   PUBLIC Folly::folly glog::glog gflags
   INTERFACE ${EXTRA_LINK_FLAGS})
-
+target_compile_definitions(yarpl PUBLIC GLOG_USE_GLOG_EXPORT)
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
     cmake/yarpl-config.cmake.in