Skip to content

Commit 43eca38

Browse files
committed
Make CMake configs work on OS X.
1 parent 2b33021 commit 43eca38

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ else()
3737
endif()
3838

3939
set(Boost_USE_MULTI_THREADED ON)
40-
find_package( Boost 1.54.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options chrono )
40+
find_package( Boost 1.54.0
41+
REQUIRED unit_test_framework system regex date_time thread filesystem
42+
program_options chrono atomic )
4143
find_package( OpenSSL )
4244
find_package( Threads )
4345
set(CMAKE_VERBOSE_MAKEFILE true)

libs/network/src/CMakeLists.txt

+7-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ set_target_properties(cppnetlib-uri
2020
install(TARGETS cppnetlib-uri
2121
EXPORT cppnetlibTargets
2222
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
23-
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
23+
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
24+
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
2425

2526
set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp)
2627
add_library(cppnetlib-server-parsers ${CPP-NETLIB_HTTP_SERVER_SRCS})
@@ -31,7 +32,8 @@ set_target_properties(cppnetlib-server-parsers
3132
install(TARGETS cppnetlib-server-parsers
3233
EXPORT cppnetlibTargets
3334
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
34-
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
35+
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
36+
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
3537

3638
set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp)
3739
add_library(cppnetlib-client-connections ${CPP-NETLIB_HTTP_CLIENT_SRCS})
@@ -43,9 +45,10 @@ if (OPENSSL_FOUND)
4345
target_link_libraries(cppnetlib-client-connections ssl crypto)
4446
endif ()
4547
if (Boost_FOUND)
46-
target_link_libraries(cppnetlib-client-connections boost_system)
48+
target_link_libraries(cppnetlib-client-connections ${Boost_System_LIBRARY})
4749
endif ()
4850
install(TARGETS cppnetlib-client-connections
4951
EXPORT cppnetlibTargets
5052
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
51-
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
53+
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
54+
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})

0 commit comments

Comments
 (0)