From db87f940e0ea14ccd665497a4fd1deda1b4dbbff Mon Sep 17 00:00:00 2001
From: Chunting Gu <sprinfall@gmail.com>
Date: Mon, 15 Jul 2019 17:24:21 +0800
Subject: [PATCH] Refine CMake to find boost.

---
 CMakeLists.txt          | 7 +------
 autotest/CMakeLists.txt | 9 ++++++++-
 examples/CMakeLists.txt | 7 ++++++-
 unittest/CMakeLists.txt | 8 +++++++-
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddd3292..89bdc18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,15 +75,10 @@ find_package(Threads REQUIRED)
 # Boost 1.66+ required.
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
-if(WIN32)
-    find_package(Boost REQUIRED)
-else()
-    find_package(Boost REQUIRED COMPONENTS system filesystem date_time)
-endif()
+find_package(Boost 1.66.0 REQUIRED COMPONENTS system filesystem date_time)
 if(Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
     link_directories(${Boost_LIBRARY_DIRS})
-    message(STATUS ${Boost_LIBRARIES})
 endif()
 
 if(WEBCC_ENABLE_SSL)
diff --git a/autotest/CMakeLists.txt b/autotest/CMakeLists.txt
index f715de3..3ada4cd 100644
--- a/autotest/CMakeLists.txt
+++ b/autotest/CMakeLists.txt
@@ -7,7 +7,14 @@ set(AT_SRCS
 set(AT_TARGET_NAME webcc_autotest)
 
 # Common libraries to link.
-set(AT_LIBS webcc jsoncpp gtest ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
+set(AT_LIBS
+    webcc
+    jsoncpp
+    gtest
+    Boost::filesystem
+    Boost::system
+    Boost::date_time
+    "${CMAKE_THREAD_LIBS_INIT}")
 
 if(WEBCC_ENABLE_SSL)
     set(AT_LIBS ${AT_LIBS} ${OPENSSL_LIBRARIES})
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 58c2ee6..739fb16 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,7 +1,12 @@
 # Examples
 
 # Common libraries to link for examples.
-set(EXAMPLE_LIBS webcc ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
+set(EXAMPLE_LIBS
+    webcc
+    Boost::filesystem
+    Boost::system
+    Boost::date_time
+    "${CMAKE_THREAD_LIBS_INIT}")
 
 if(WEBCC_ENABLE_SSL)
     set(EXAMPLE_LIBS ${EXAMPLE_LIBS} ${OPENSSL_LIBRARIES})
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index f82e544..e0b181b 100644
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -11,7 +11,13 @@ set(UT_SRCS
 set(UT_TARGET_NAME webcc_unittest)
 
 # Common libraries to link.
-set(UT_LIBS webcc gtest ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
+set(UT_LIBS
+    webcc
+    gtest
+    Boost::filesystem
+    Boost::system
+    Boost::date_time
+    "${CMAKE_THREAD_LIBS_INIT}")
 
 if(WEBCC_ENABLE_SSL)
     set(UT_LIBS ${UT_LIBS} ${OPENSSL_LIBRARIES})