From af296428cb43a898af1a673e6c952bc12be6f5fd Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 20 Jan 2014 21:41:45 +0400 Subject: [PATCH] Remove unnecessary 'add_dependencies' commands If 'target_link_libraries' used, no need to add dependency explicitly. From documentation: If a library name matches that of another target in the project a dependency will automatically be added in the build system to make sure the library being linked is up-to-date before the target links. --- http/src/CMakeLists.txt | 16 ---------------- logging/test/CMakeLists.txt | 3 --- message/src/CMakeLists.txt | 1 - message/test/CMakeLists.txt | 5 ----- 4 files changed, 25 deletions(-) diff --git a/http/src/CMakeLists.txt b/http/src/CMakeLists.txt index efd56a6ae..5846d842a 100644 --- a/http/src/CMakeLists.txt +++ b/http/src/CMakeLists.txt @@ -25,8 +25,6 @@ set(CPP-NETLIB_HTTP_MESSAGE_SRCS if(NOT CPP-NETLIB_BUILD_SINGLE_LIB) add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS}) - add_dependencies(cppnetlib-http-message - cppnetlib-message) target_link_libraries(cppnetlib-http-message ${Boost_LIBRARIES} cppnetlib-message) @@ -77,17 +75,6 @@ endif() # #if(NOT CPP-NETLIB_BUILD_SINGLE_LIB) # add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS}) -# add_dependencies(cppnetlib-http-client -# ${CPP-NETLIB_LOGGING_LIB} -# cppnetlib-constants -# cppnetlib-uri -# cppnetlib-message -# cppnetlib-message-wrappers -# cppnetlib-message-directives -# cppnetlib-http-message -# cppnetlib-http-message-wrappers -# cppnetlib-http-client-connections -# ) # target_link_libraries(cppnetlib-http-client # ${Boost_LIBRARIES} # ${CPP-NETLIB_LOGGING_LIB} @@ -108,9 +95,6 @@ set(CPP-NETLIB_HTTP_V2_CLIENT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/http/v2/client/client_errors.cpp ) add_library(network-http-v2-client ${CPP-NETLIB_HTTP_V2_CLIENT_SRCS}) -add_dependencies(network-http-v2-client - network-uri - ) target_link_libraries(network-http-v2-client ${Boost_LIBRARIES} network-uri diff --git a/logging/test/CMakeLists.txt b/logging/test/CMakeLists.txt index 31fa3004a..2a54f682d 100644 --- a/logging/test/CMakeLists.txt +++ b/logging/test/CMakeLists.txt @@ -17,10 +17,8 @@ if (CPP-NETLIB_BUILD_TESTS) ) if(CPP-NETLIB_BUILD_SINGLE_LIB) set(link_cppnetlib_lib cppnetlib) - set(dependency cppnetlib) else() set(link_cppnetlib_lib cppnetlib-logging) - set(dependency cppnetlib-logging) endif() foreach (test ${TESTS}) if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU) @@ -28,7 +26,6 @@ if (CPP-NETLIB_BUILD_TESTS) PROPERTIES COMPILE_FLAGS "-Wall") endif() add_executable(cpp-netlib-${test} ${test}.cpp) - add_dependencies(cpp-netlib-${test} ${dependency}) target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${link_cppnetlib_lib}) set_target_properties(cpp-netlib-${test} diff --git a/message/src/CMakeLists.txt b/message/src/CMakeLists.txt index 61726eb9a..22e2fc67f 100644 --- a/message/src/CMakeLists.txt +++ b/message/src/CMakeLists.txt @@ -11,7 +11,6 @@ set(CPP-NETLIB_MESSAGE_SRCS message.cpp) add_library(cppnetlib-message ${CPP-NETLIB_MESSAGE_SRCS}) -add_dependencies(cppnetlib-message network-uri) target_link_libraries(cppnetlib-message network-uri) set(CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS diff --git a/message/test/CMakeLists.txt b/message/test/CMakeLists.txt index f96b96b25..6235e0fa6 100644 --- a/message/test/CMakeLists.txt +++ b/message/test/CMakeLists.txt @@ -11,18 +11,13 @@ if (CPP-NETLIB_BUILD_TESTS) set(TESTS message_test message_transform_test) if(CPP-NETLIB_BUILD_SINGLE_LIB) set(link_cppnetlib_lib cppnetlib) - set(dependencies cppnetlib) else() set(link_cppnetlib_lib cppnetlib-message cppnetlib-message-directives cppnetlib-message-wrappers) - set(dependencies cppnetlib-message - cppnetlib-message-directives - cppnetlib-message-wrappers) endif() foreach (test ${TESTS}) add_executable(cpp-netlib-${test} ${test}.cpp) - add_dependencies(cpp-netlib-${test} ${dependencies}) target_link_libraries(cpp-netlib-${test} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}