Skip to content

Remove unnecessary 'add_dependencies' commands #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2014
Merged

Remove unnecessary 'add_dependencies' commands #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
  • Loading branch information
@ruslo
ruslo committed Jan 20, 2014
commit af296428cb43a898af1a673e6c952bc12be6f5fd
16 changes: 0 additions & 16 deletions http/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions logging/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@ 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)
set_source_files_properties(${test}.cpp
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}
Expand Down
1 change: 0 additions & 1 deletion message/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions message/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down