Fix linking and global includes

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)

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}

psrdada_cpp/CMakeLists.txt

 # 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

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")
 

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")

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")

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")