From b5a80a4b41b18400db7c0686199bb7f65fcd6820 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Fri, 28 Jun 2024 16:17:28 +0200
Subject: [PATCH] Fix linting
---
CMakeLists.txt | 6 ++++--
CPack/CMakeLists.txt | 8 ++++----
docs/CMakeLists.txt | 3 ++-
pythondp3/CMakeLists.txt | 3 ++-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9eeaee4..1708d65e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -662,7 +662,8 @@ target_link_libraries(edgeshowsourcedb ${SOURCEDB_LIBRARIES})
add_executable(edgemsoverview base/msoverview.cc base/MS.cc)
target_link_libraries(edgemsoverview ${CASACORE_LIBRARIES} ${Boost_LIBRARIES})
-install(TARGETS EDGEDP3 edgemakesourcedb edgeshowsourcedb edgemsoverview DESTINATION bin)
+install(TARGETS EDGEDP3 edgemakesourcedb edgeshowsourcedb edgemsoverview
+ DESTINATION bin)
# Install a script that warns users that EDGEDP3 is the new name of the executable
install(
@@ -827,7 +828,8 @@ if(BUILD_TESTING)
if(BUILD_WITH_CUDA)
set_target_properties(unittests PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)
endif()
- target_link_libraries(unittests LIBEDGEDP3 ${EDGEDP3_LIBRARIES} xtensor xtensor-blas)
+ target_link_libraries(unittests LIBEDGEDP3 ${EDGEDP3_LIBRARIES} xtensor
+ xtensor-blas)
# Automatically (re)build the unit tests on every ctest run.
add_test(buildunittests ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
diff --git a/CPack/CMakeLists.txt b/CPack/CMakeLists.txt
index d4926308..13e2ff1b 100644
--- a/CPack/CMakeLists.txt
+++ b/CPack/CMakeLists.txt
@@ -25,9 +25,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/DetermineTargetCPU.cmake)
# Set package name: encode target CPU, if defined, in package name.
if(DEFINED IDENTIFIED_TARGET_CPU)
- set(CPACK_PACKAGE_NAME "dp3-${IDENTIFIED_TARGET_CPU}")
+ set(CPACK_PACKAGE_NAME "edgedp3-${IDENTIFIED_TARGET_CPU}")
else()
- set(CPACK_PACKAGE_NAME "dp3")
+ set(CPACK_PACKAGE_NAME "edgedp3")
endif()
set(CPACK_PACKAGE_VENDOR "ASTRON")
@@ -54,14 +54,14 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
# Determine list of conflicting package names. Packages not built for current
# target CPU always conflict.
if(DEFINED IDENTIFIED_TARGET_CPU)
- set(_conflicts dp3)
+ set(_conflicts edgedp3)
else()
set(_conflicts)
endif()
foreach(_cpu ${KNOWN_TARGET_CPUS})
if(NOT "${_cpu}" STREQUAL "${IDENTIFIED_TARGET_CPU}")
if("${_conflicts}" STREQUAL "")
- set(_conflicts "dp3-${_cpu}")
+ set(_conflicts "edgedp3-${_cpu}")
else()
set(_conflicts "${_conflicts}, dp3-${_cpu}")
endif()
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index df3744e8..a17aa89c 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -19,7 +19,8 @@ if(NOT EDGEDP3_VERSION)
set(EDGEDP3_VERSION_PATCH "${CMAKE_MATCH_3}")
else()
message(
- FATAL_ERROR "Failed to parse EDGEDP3_VERSION from top level CMakeLists.txt")
+ FATAL_ERROR
+ "Failed to parse EDGEDP3_VERSION from top level CMakeLists.txt")
endif()
endif()
diff --git a/pythondp3/CMakeLists.txt b/pythondp3/CMakeLists.txt
index 565fe68a..986eabae 100644
--- a/pythondp3/CMakeLists.txt
+++ b/pythondp3/CMakeLists.txt
@@ -32,5 +32,6 @@ target_link_libraries(fitters PRIVATE xtensor)
install(TARGETS parameterset pydp3 fitters
DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3")
install(FILES __init__.py DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3")
-install(FILES steps/__init__.py DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3/steps")
+install(FILES steps/__init__.py
+ DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3/steps")
install(FILES steps/queue.py DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3/steps")
--
GitLab