Skip to content
Snippets Groups Projects
Commit 8f72f45c authored by Niclas Esser's avatar Niclas Esser
Browse files

Merge branch 'debian-build' into 'devel'

Set new psrdada_cpp UNRELEASED to fix signing issue; Install...

See merge request !38
parents fc5b90c6 9d6a5f63
No related branches found
No related tags found
1 merge request!38Set new psrdada_cpp UNRELEASED to fix signing issue; Install...
Pipeline #227381 passed
......@@ -35,6 +35,7 @@
build/
release/
debug/
obj-x86_64-linux-gnu/
# Editor files
*~
......
......@@ -101,8 +101,6 @@ build-deb:
needs: ["test_cpp"]
stage: binary_release
extends: .build_template
variables:
LOG_LEVEL: info
upload-deb:
needs: ["build-deb"]
......
......@@ -18,8 +18,8 @@ elseif(NOT ENABLE_CUDA)
endif()
# The version number.
set(psrdada_cpp_VERSION_MAJOR 0)
set(psrdada_cpp_VERSION_MINOR 1)
set(psrdada_cpp_VERSION_MAJOR 1)
set(psrdada_cpp_VERSION_MINOR 0)
set(psrdada_cpp_VERSION_PATCH 0)
set(PROJECT_VERSION "${psrdada_cpp_VERSION_MAJOR}.${psrdada_cpp_VERSION_MINOR}.${psrdada_cpp_VERSION_PATCH}")
......@@ -85,6 +85,3 @@ if (DEBUG_PRINT)
message(STATUS "****************************************************************************")
message(STATUS "")
endif (DEBUG_PRINT)
ENABLE_TESTING()
......@@ -27,8 +27,8 @@ All flags are passed to cmake with the CMake prefix `-D<flagname>`
| `ENABLE_CUDA` | Allows compilation with `nvcc` which is require to compile `.cuh` and `.cu` | `ON` (default), `OFF` | - |
| `BUILD_SUBMODULES` | Build submodules (excluding dadaflow). | `ON` (default), `OFF` | - |
| `BUILD_DADAFLOW` | Builds the dadaflow submodule. | `OFF` (default), `ON` | - |
| `ENABLE_TESTING` | Installs the `googlebenchmark`-project, and compiles registered tests. Only has effect when `BUILD_SUBMODULES` is `ON`. | `ON` (default), `OFF` | `make -C <path-to-build> test` |
| `ENABLE_BENCHMARK` | Installs the `googlebenchmark` project and compiles benchmark applications of submodules. Only has effect when `BUILD_SUBMODULES` is `ON`. | `OFF` (default), `ON` | `make -C <path-to-build> benchmark` |
| `ENABLE_TESTING` | Enables testing relying on `googletest`. If `googletest` is not found by cmake it gets pulled from remote. | `ON` (default), `OFF` | `make -C <path-to-build> test` |
| `ENABLE_BENCHMARK` | Enables benchmarks relying on `googlebenchmark`. If `googlebenchmark` is not found by cmake it gets pulled from remote. Only has effect when `BUILD_SUBMODULES` is `ON`. | `OFF` (default), `ON` | `make -C <path-to-build> run_benchmark` |
## Documentation
The documentation of psrdadad-cpp can be found at: http://mpifr-bdg.pages.mpcdf.de/psrdada_cpp/
......
if(ENABLE_TESTING)
enable_testing()
find_package(GTest QUIET)
if (GTest_FOUND)
message(STATUS "Googletest found! Version: ${GTest_VERSION}")
......
psrdadacpp (241112+devel) UNRELEASED; urgency=medium
* New upstream release
* Added dadaflow library to the package
* Removed application libraries gated_spectrometer, merger, fft_spectrometer
* Refactored CMake project
-- Niclas Esser <nesser@mpifr-bonn.mpg.de> Tue, 12 Nov 2024 09:25:10 +0000
psrdadacpp (241017+devel1) UNRELEASED; urgency=medium
* New upstream release
......
usr/include
usr/lib/*.a
usr/lib/cmake/psrdada_cpp/psrdada_cppTargets-none.cmake
usr/lib/cmake/psrdada_cpp/psrdada_cppTargets.cmake
usr/lib/cmake/psrdada_cpp/psrdada_cppConfig.cmake
usr/lib/cmake/psrdada_cpp/psrdada_cppConfigVersion.cmake
......@@ -12,12 +12,13 @@ export DEB_CFLAGS_MAINT_APPEND = -fPIC
# package maintainers to append LDFLAGS
export DEB_LDFLAGS_MAINT_APPEND = -fPIC
export LOG_LEVEL="info"
%:
dh $@
dh $@ --builddirectory=
override_dh_auto_configure:
dh_auto_configure -- -DENABLE_TESTING=ON -DBUILD_DADAFLOW=ON -DCMAKE_CUDA_ARCHITECTURES="75;80;86;89" -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
\ No newline at end of file
......@@ -109,7 +109,6 @@ target_link_libraries (dbdisk_multithread ${PSRDADA_CPP_LIBRARIES})
# Install testing tools if testing is enabled
if(ENABLE_TESTING)
enable_testing()
set(PSRDADA_CPP_TESTING_INC
testing_tools/clients.hpp
testing_tools/streams.hpp
......@@ -136,7 +135,7 @@ if (BUILD_DADAFLOW)
add_subdirectory(dadaflow)
endif()
# Add benchmark binaries here to get executed with make benchmark
# Add benchmark binaries here to get executed with 'make -C <path-to-build> run_benchmark'
if(ENABLE_BENCHMARK AND BUILD_SUBMODULES)
add_custom_target(run_benchmark
COMMAND gspectrometer_benchmark --benchmark_counters_tabular=true
......@@ -149,26 +148,31 @@ endif()
# --------------------------------------------------------------------- #
install (TARGETS junkdb dbnull syncdb dbreset diskdb dbsplit zerodb dbdisk_multithread DESTINATION bin)
install (TARGETS ${CMAKE_PROJECT_NAME}
EXPORT ${CMAKE_PROJECT_NAME}Targets
EXPORT ${CMAKE_PROJECT_NAME}Targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
INCLUDES DESTINATION include)
install(FILES ${PSRDADA_CPP_INC} DESTINATION include/psrdada_cpp)
# Generate the config file for find_package()
include(CMakePackageConfigHelpers)
set(GENEREATED_DIR "${CMAKE_BINARY_DIR}/generated" CACHE INTERNAL "")
set(CMAKE_FILES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}")
set(VERSION_FILE "${GENEREATED_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake")
# Use CMake generator to create version and config files
write_basic_package_version_file(${VERSION_FILE} VERSION ${PROJECT_VERSION} COMPATIBILITY AnyNewerVersion)
set(CONFIG_FILE "${GENEREATED_DIR}/${CMAKE_PROJECT_NAME}Config.cmake")
configure_package_config_file("${CMAKE_SOURCE_DIR}/cmake/Config.cmake.in" "${CONFIG_FILE}" INSTALL_DESTINATION ${CMAKE_FILES_INSTALL_DIR})
configure_package_config_file("${CMAKE_SOURCE_DIR}/cmake/Config.cmake.in" "${CONFIG_FILE}" INSTALL_DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
# Create cmake folder and export the cmake project
install(EXPORT ${CMAKE_PROJECT_NAME}Targets
FILE ${CMAKE_PROJECT_NAME}Targets.cmake
NAMESPACE ${CMAKE_PROJECT_NAME}::
DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
# Install the generated files in the cmale folder
install(FILES ${VERSION_FILE} ${CONFIG_FILE}
COMPONENT "${PROJECT_NAME}"
DESTINATION ${CMAKE_FILES_INSTALL_DIR})
\ No newline at end of file
DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
\ No newline at end of file
......@@ -15,9 +15,6 @@ set(psrdada_cpp_edd_merge_inc
add_library(${CMAKE_PROJECT_NAME}_edd_merge ${psrdada_cpp_edd_merge_src})
install(FILES ${psrdada_cpp_edd_merge_inc} DESTINATION include/psrdada_cpp/merger)
install(DIRECTORY src DESTINATION include/psrdada_cpp/merger)
add_executable(edd_merge_all cli/edd_merge_cli.cpp)
target_link_libraries(edd_merge_all ${PSRDADA_CPP_MERGE_LIBRARIES})
install(TARGETS edd_merge_all DESTINATION bin)
......@@ -33,6 +30,7 @@ install(TARGETS edd_merge DESTINATION bin)
if (ENABLE_TESTING)
add_subdirectory(test)
endif()
if (ENABLE_BENCHMARK)
include_directories(${BENCHMARK_INCLUDE_DIR})
link_directories(${BENCHMARK_LIBRARY_DIR})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment