From 5aa306fa6594601b7adf48ffd132ff7e51f61703 Mon Sep 17 00:00:00 2001 From: Tobias Winchen <tobias.winchen@rwth-aachen.de> Date: Fri, 9 Oct 2020 13:56:29 +0000 Subject: [PATCH] Fix linking and global includes --- CMakeLists.txt | 2 ++ cmake/dependencies.cmake | 5 ++--- psrdada_cpp/CMakeLists.txt | 3 +-- psrdada_cpp/effelsberg/edd/test/CMakeLists.txt | 2 +- psrdada_cpp/effelsberg/paf/test/CMakeLists.txt | 3 ++- psrdada_cpp/effelsberg/rfi_chamber/test/CMakeLists.txt | 2 +- psrdada_cpp/meerkat/fbfuse/test/CMakeLists.txt | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5f29835..69dc6056 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ include(dependencies) # === process through the cheetah tree: add_subdirectory(${CMAKE_PROJECT_NAME}) + + # === Print build options summary. set(DEBUG_PRINT ON) if (DEBUG_PRINT) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 0d952ba1..5b8bf730 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -3,10 +3,9 @@ include(compiler_settings) include(cmake/googletest.cmake) include(cmake/boost.cmake) include(cmake/psrdada.cmake) -include_directories(SYSTEM ${Boost_INCLUDE_DIR} ${PSRDADA_INCLUDE_DIR}) -include_directories(BEFORE ${GTEST_INCLUDE_DIR}) +include_directories(${Boost_INCLUDE_DIR} ${PSRDADA_INCLUDE_DIR}) +include_directories(${GTEST_INCLUDE_DIR}) set(DEPENDENCY_LIBRARIES - ${GTEST_LIBRARIES} ${Boost_LIBRARIES} ${PSRDADA_LIBRARIES} ${CUDA_CUDART_LIBRARY} diff --git a/psrdada_cpp/CMakeLists.txt b/psrdada_cpp/CMakeLists.txt index 357f45db..240f01c6 100644 --- a/psrdada_cpp/CMakeLists.txt +++ b/psrdada_cpp/CMakeLists.txt @@ -1,8 +1,7 @@ # define the cheetah libraries set(PSRDADA_CPP_LIBRARIES ${CMAKE_PROJECT_NAME} ${DEPENDENCY_LIBRARIES}) -include_directories(..) -include_directories(${PROJECT_BINARY_DIR}) +include_directories(${CMAKE_SOURCE_DIR}) set(psrdada_cpp_src src/cli_utils.cpp diff --git a/psrdada_cpp/effelsberg/edd/test/CMakeLists.txt b/psrdada_cpp/effelsberg/edd/test/CMakeLists.txt index 04fb5102..82529b79 100644 --- a/psrdada_cpp/effelsberg/edd/test/CMakeLists.txt +++ b/psrdada_cpp/effelsberg/edd/test/CMakeLists.txt @@ -19,6 +19,6 @@ set(gtest_edd_src src/SpectralKurtosisCudaTester.cu ) cuda_add_executable(gtest_edd ${gtest_edd_src} ) -target_link_libraries(gtest_edd ${PSRDADA_CPP_EFFELSBERG_EDD_LIBRARIES} ${CUDA_CUFFT_LIBRARIES} -lcublas -lnvToolsExt -L/usr/local/cuda-11.0/lib64/) +target_link_libraries(gtest_edd ${PSRDADA_CPP_EFFELSBERG_EDD_LIBRARIES} ${CUDA_CUFFT_LIBRARIES} -lcublas -lnvToolsExt -L/usr/local/cuda-11.0/lib64/ ${GTEST_LIBRARIES}) add_test(gtest_edd gtest_edd --test_data "${CMAKE_CURRENT_LIST_DIR}/data") diff --git a/psrdada_cpp/effelsberg/paf/test/CMakeLists.txt b/psrdada_cpp/effelsberg/paf/test/CMakeLists.txt index 50e77063..d4989199 100644 --- a/psrdada_cpp/effelsberg/paf/test/CMakeLists.txt +++ b/psrdada_cpp/effelsberg/paf/test/CMakeLists.txt @@ -7,5 +7,6 @@ set( src/UnpackerTester.cu ) cuda_add_executable(gtest_paf ${gtest_paf_src} ) -target_link_libraries(gtest_paf ${PSRDADA_CPP_EFFELSBERG_PAF_LIBRARIES} ${CUDA_CUFFT_LIBRARIES}) + +target_link_libraries(gtest_paf ${PSRDADA_CPP_EFFELSBERG_PAF_LIBRARIES} ${CUDA_CUFFT_LIBRARIES} ${GTEST_LIBRARIES}) add_test(gtest_paf gtest_paf --test_data "${CMAKE_CURRENT_LIST_DIR}/data") diff --git a/psrdada_cpp/effelsberg/rfi_chamber/test/CMakeLists.txt b/psrdada_cpp/effelsberg/rfi_chamber/test/CMakeLists.txt index e0d1e293..06d643db 100644 --- a/psrdada_cpp/effelsberg/rfi_chamber/test/CMakeLists.txt +++ b/psrdada_cpp/effelsberg/rfi_chamber/test/CMakeLists.txt @@ -8,5 +8,5 @@ set( src/gtest_rfi_chamber.cu ) cuda_add_executable(gtest_rfi_chamber ${gtest_rfi_chamber_src} ) -target_link_libraries(gtest_rfi_chamber ${PSRDADA_CPP_EFFELSBERG_RFI_CHAMBER_LIBRARIES} ${CUDA_CUFFT_LIBRARIES}) +target_link_libraries(gtest_rfi_chamber ${PSRDADA_CPP_EFFELSBERG_RFI_CHAMBER_LIBRARIES} ${CUDA_CUFFT_LIBRARIES} ${GTEST_LIBRARIES}) add_test(gtest_rfi_chamber gtest_rfi_chamber --test_data "${CMAKE_CURRENT_LIST_DIR}/data") diff --git a/psrdada_cpp/meerkat/fbfuse/test/CMakeLists.txt b/psrdada_cpp/meerkat/fbfuse/test/CMakeLists.txt index eb55b47d..fe9aea87 100644 --- a/psrdada_cpp/meerkat/fbfuse/test/CMakeLists.txt +++ b/psrdada_cpp/meerkat/fbfuse/test/CMakeLists.txt @@ -13,5 +13,5 @@ set( src/gtest_fbfuse.cu ) cuda_add_executable(gtest_fbfuse ${gtest_fbfuse_src} ) -target_link_libraries(gtest_fbfuse ${PSRDADA_CPP_MEERKAT_FBFUSE_LIBRARIES}) +target_link_libraries(gtest_fbfuse ${PSRDADA_CPP_MEERKAT_FBFUSE_LIBRARIES} ${GTEST_LIBRARIES}) add_test(gtest_fbfuse gtest_fbfuse --test_data "${CMAKE_CURRENT_LIST_DIR}/data") -- GitLab