Skip to content

Commit c1e2fe8

Browse files
committed
CMake: clean up use of target_link_libraries
1 parent d6415a2 commit c1e2fe8

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

CMakeLists.txt

+8-10
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ src/PassiveSocket.cpp
2424
# append to sources so that dependency checks work on headers
2525
LIST(APPEND CLSOCKET_SOURCES ${CLSOCKET_HEADERS})
2626

27-
# OS and compiler checks.
28-
if(WIN32)
29-
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
30-
SET(PROJECT_LIBS Ws2_32.lib)
31-
endif()
32-
3327
OPTION(BUILD_SHARED_LIBS "Build libs as shared" ON)
3428
if(DEFINED CLSOCKET_SHARED)
3529
message(FATAL_ERROR "The CLSOCKET_SHARED option is deprecated, instead use BUILD_SHARED_LIBS.")
@@ -40,7 +34,11 @@ endif()
4034

4135
# make the lib
4236
ADD_LIBRARY(clsocket ${CLSOCKET_SOURCES})
43-
TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS})
37+
target_include_directories(clsocket PUBLIC src)
38+
if(WIN32)
39+
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
40+
target_link_libraries(clsocket PRIVATE Ws2_32)
41+
endif()
4442
# target_include_directories was added in 2.8.11
4543
set_target_properties(clsocket PROPERTIES
4644
INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src
@@ -59,13 +57,13 @@ if(UNIX)
5957

6058
if(CLSOCKET_EXAMPLES)
6159
ADD_EXECUTABLE(clsocket-example examples/RecvAsync.cpp)
62-
TARGET_LINK_LIBRARIES(clsocket-example clsocket pthread)
60+
target_link_libraries(clsocket-example clsocket pthread)
6361
install(TARGETS clsocket-example DESTINATION bin)
6462

6563
ADD_EXECUTABLE(querydaytime-example examples/QueryDayTime.cpp)
66-
TARGET_LINK_LIBRARIES(querydaytime-example clsocket)
64+
target_link_libraries(querydaytime-example clsocket)
6765

6866
ADD_EXECUTABLE(echoserver-example examples/EchoServer.cpp)
69-
TARGET_LINK_LIBRARIES(echoserver-example clsocket)
67+
target_link_libraries(echoserver-example clsocket)
7068
endif()
7169
endif()

0 commit comments

Comments
 (0)