Refine CMake to find boost.
This commit is contained in:
+1
-6
@@ -75,15 +75,10 @@ find_package(Threads REQUIRED)
|
|||||||
# Boost 1.66+ required.
|
# Boost 1.66+ required.
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
set(Boost_USE_MULTITHREADED ON)
|
set(Boost_USE_MULTITHREADED ON)
|
||||||
if(WIN32)
|
find_package(Boost 1.66.0 REQUIRED COMPONENTS system filesystem date_time)
|
||||||
find_package(Boost REQUIRED)
|
|
||||||
else()
|
|
||||||
find_package(Boost REQUIRED COMPONENTS system filesystem date_time)
|
|
||||||
endif()
|
|
||||||
if(Boost_FOUND)
|
if(Boost_FOUND)
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
link_directories(${Boost_LIBRARY_DIRS})
|
link_directories(${Boost_LIBRARY_DIRS})
|
||||||
message(STATUS ${Boost_LIBRARIES})
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WEBCC_ENABLE_SSL)
|
if(WEBCC_ENABLE_SSL)
|
||||||
|
|||||||
@@ -7,7 +7,14 @@ set(AT_SRCS
|
|||||||
set(AT_TARGET_NAME webcc_autotest)
|
set(AT_TARGET_NAME webcc_autotest)
|
||||||
|
|
||||||
# Common libraries to link.
|
# 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)
|
if(WEBCC_ENABLE_SSL)
|
||||||
set(AT_LIBS ${AT_LIBS} ${OPENSSL_LIBRARIES})
|
set(AT_LIBS ${AT_LIBS} ${OPENSSL_LIBRARIES})
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
# Examples
|
# Examples
|
||||||
|
|
||||||
# Common libraries to link for 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)
|
if(WEBCC_ENABLE_SSL)
|
||||||
set(EXAMPLE_LIBS ${EXAMPLE_LIBS} ${OPENSSL_LIBRARIES})
|
set(EXAMPLE_LIBS ${EXAMPLE_LIBS} ${OPENSSL_LIBRARIES})
|
||||||
|
|||||||
@@ -11,7 +11,13 @@ set(UT_SRCS
|
|||||||
set(UT_TARGET_NAME webcc_unittest)
|
set(UT_TARGET_NAME webcc_unittest)
|
||||||
|
|
||||||
# Common libraries to link.
|
# 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)
|
if(WEBCC_ENABLE_SSL)
|
||||||
set(UT_LIBS ${UT_LIBS} ${OPENSSL_LIBRARIES})
|
set(UT_LIBS ${UT_LIBS} ${OPENSSL_LIBRARIES})
|
||||||
|
|||||||
Reference in New Issue
Block a user