diff --git a/cmake/generic.cmake b/cmake/generic.cmake index efc49b8fd3c1170a43e5b7322cfd03f99cbb4154..bd61e951b0cd6bc5443d9ef1c274f3b13fa182e1 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -29,6 +29,25 @@ # https://cmake.org/cmake/help/v3.0/module/CMakeParseArguments.html # +# generic.cmake depends on {GLOG,GFLAGS,GTEST,GTEST_MAIN}_LIBRARIES +# generated by cmake/external/*.cmake. + +# Because gflags depends on pthread, I copied the following snippet +# from https://stackoverflow.com/a/29871891/724872. +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) + +function(link_glog_gflags TARGET_NAME) + target_link_libraries(${TARGET_NAME} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} Threads::Threads) + add_dependencies(${TARGET_NAME} glog gflags) +endfunction() + +function(link_gtest TARGET_NAME) + target_link_libraries(${TARGET_NAME} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) + add_dependencies(${TARGET_NAME} gtest) +endfunction() + + # cc_library parses tensor.cc and figures out that target also depend on tensor.h. # cc_library(tensor # SRCS @@ -45,7 +64,9 @@ function(cc_library TARGET_NAME) else() add_library(${TARGET_NAME} STATIC ${cc_library_SRCS}) endif() - add_dependencies(${TARGET_NAME} ${cc_library_DEPS} ${external_project_dependencies}) + if (cc_library_DEPS) + add_dependencies(${TARGET_NAME} ${cc_library_DEPS}) + endif() endfunction(cc_library) # cc_binary parses tensor.cc and figures out that target also depend on tensor.h. @@ -58,11 +79,11 @@ function(cc_binary TARGET_NAME) set(multiValueArgs SRCS DEPS) cmake_parse_arguments(cc_binary "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) add_executable(${TARGET_NAME} ${cc_binary_SRCS}) - link_paddle_exe(${TARGET_NAME}) if(cc_binary_DEPS) target_link_libraries(${TARGET_NAME} ${cc_binary_DEPS}) add_dependencies(${TARGET_NAME} ${cc_binary_DEPS}) endif() + link_glog_gflags(${TARGET_NAME}) endfunction(cc_binary) # The dependency to target tensor implies that if any of @@ -78,11 +99,12 @@ function(cc_test TARGET_NAME) set(multiValueArgs SRCS DEPS) cmake_parse_arguments(cc_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) add_executable(${TARGET_NAME} ${cc_test_SRCS}) - link_paddle_test(${TARGET_NAME}) if(cc_test_DEPS) target_link_libraries(${TARGET_NAME} ${cc_test_DEPS}) add_dependencies(${TARGET_NAME} ${cc_test_DEPS}) endif() + link_glog_gflags(${TARGET_NAME}) + link_gtest(${TARGET_NAME}) add_test(${TARGET_NAME} ${TARGET_NAME}) endfunction(cc_test) @@ -104,7 +126,9 @@ function(nv_library TARGET_NAME) else() cuda_add_library(${TARGET_NAME} STATIC ${nv_library_SRCS}) endif() - add_dependencies(${TARGET_NAME} ${nv_library_DEPS} ${external_project_dependencies}) + if (nv_library_DEPS) + add_dependencies(${TARGET_NAME} ${nv_library_DEPS}) + endif() endfunction(nv_library) function(nv_binary TARGET_NAME) @@ -113,11 +137,11 @@ function(nv_binary TARGET_NAME) set(multiValueArgs SRCS DEPS) cmake_parse_arguments(nv_binary "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cuda_add_executable(${TARGET_NAME} ${nv_binary_SRCS}) - link_paddle_exe(${TARGET_NAME}) if(nv_binary_DEPS) target_link_libraries(${TARGET_NAME} ${nv_binary_DEPS}) add_dependencies(${TARGET_NAME} ${nv_binary_DEPS}) endif() + link_glog_gflags(${TARGET_NAME}) endfunction(nv_binary) # The dependency to target tensor implies that if any of @@ -133,11 +157,12 @@ function(nv_test TARGET_NAME) set(multiValueArgs SRCS DEPS) cmake_parse_arguments(nv_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cuda_add_executable(${TARGET_NAME} ${nv_test_SRCS}) - link_paddle_test(${TARGET_NAME}) if(nv_test_DEPS) target_link_libraries(${TARGET_NAME} ${nv_test_DEPS}) add_dependencies(${TARGET_NAME} ${nv_test_DEPS}) endif() + link_glog_gflags(${TARGET_NAME}) + link_gtest(${TARGET_NAME}) add_test(${TARGET_NAME} ${TARGET_NAME}) endfunction(nv_test)