Fix build on Mac

master
Adam Gu 6 years ago
parent 4721d50363
commit 847a20483f

@ -75,9 +75,9 @@ find_package(Threads 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) if(WIN32)
find_package(Boost 1.66.0 REQUIRED) find_package(Boost REQUIRED)
else() else()
find_package(Boost 1.66.0 REQUIRED COMPONENTS system filesystem) find_package(Boost REQUIRED COMPONENTS system filesystem date_time)
endif() endif()
if(Boost_FOUND) if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
@ -128,20 +128,25 @@ endif()
add_subdirectory(webcc) add_subdirectory(webcc)
if(WEBCC_ENABLE_EXAMPLES) if(WEBCC_ENABLE_AUTOTEST OR WEBCC_ENABLE_EXAMPLES)
# For including jsoncpp as "json/json.h". # For including jsoncpp as "json/json.h".
include_directories(${THIRD_PARTY_DIR}/src/jsoncpp) include_directories(${THIRD_PARTY_DIR}/src/jsoncpp)
# REST examples need jsoncpp to parse and create JSON.
add_subdirectory(${THIRD_PARTY_DIR}/src/jsoncpp) add_subdirectory(${THIRD_PARTY_DIR}/src/jsoncpp)
endif()
add_subdirectory(examples) if(WEBCC_ENABLE_AUTOTEST OR WEBCC_ENABLE_UNITTEST)
add_subdirectory(${THIRD_PARTY_DIR}/src/gtest)
endif() endif()
if(WEBCC_ENABLE_AUTOTEST) if(WEBCC_ENABLE_AUTOTEST)
add_subdirectory(autotest) add_subdirectory(autotest)
endif() endif()
if(WEBCC_ENABLE_EXAMPLES)
add_subdirectory(examples)
endif()
if(WEBCC_ENABLE_UNITTEST) if(WEBCC_ENABLE_UNITTEST)
add_subdirectory(${THIRD_PARTY_DIR}/src/gtest)
add_subdirectory(unittest) add_subdirectory(unittest)
endif() endif()

@ -1,4 +1,4 @@
# Auto test # Automation test
set(AT_SRCS set(AT_SRCS
client_autotest.cc client_autotest.cc
@ -7,22 +7,23 @@ set(AT_SRCS
set(AT_TARGET_NAME webcc_autotest) set(AT_TARGET_NAME webcc_autotest)
# Common libraries to link. # Common libraries to link.
set(TEST_LIBS webcc ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}") set(AT_LIBS webcc ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
if(WEBCC_ENABLE_SSL) if(WEBCC_ENABLE_SSL)
set(TEST_LIBS ${TEST_LIBS} ${OPENSSL_LIBRARIES}) set(AT_LIBS ${AT_LIBS} ${OPENSSL_LIBRARIES})
endif() endif()
if(WIN32) if(WIN32)
set(TEST_LIBS ${TEST_LIBS} zlibstatic crypt32) # TODO: crypt32 should be ssl related.
set(AT_LIBS ${AT_LIBS} zlibstatic crypt32)
else() else()
set(TEST_LIBS ${TEST_LIBS} ${ZLIB_LIBRARIES}) set(AT_LIBS ${AT_LIBS} ${ZLIB_LIBRARIES})
endif() endif()
if(UNIX) if(UNIX)
# Add `-ldl` for Linux to avoid "undefined reference to `dlopen'". # Add `-ldl` for Linux to avoid "undefined reference to `dlopen'".
set(TEST_LIBS ${TEST_LIBS} ${CMAKE_DL_LIBS}) set(AT_LIBS ${AT_LIBS} ${CMAKE_DL_LIBS})
endif() endif()
add_executable(${AT_TARGET_NAME} ${AT_SRCS}) add_executable(${AT_TARGET_NAME} ${AT_SRCS})
target_link_libraries(${AT_TARGET_NAME} webcc jsoncpp gtest ${TEST_LIBS}) target_link_libraries(${AT_TARGET_NAME} webcc jsoncpp gtest ${AT_LIBS})

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Loading…
Cancel
Save