Skip to content
Snippets Groups Projects
Commit b5a80a4b authored by Mattia Mancini's avatar Mattia Mancini
Browse files

Fix linting

parent 54270fcd
Branches
No related tags found
1 merge request!1Update EdgeDP3 to not clush with DP3
Pipeline #86574 failed
...@@ -662,7 +662,8 @@ target_link_libraries(edgeshowsourcedb ${SOURCEDB_LIBRARIES}) ...@@ -662,7 +662,8 @@ target_link_libraries(edgeshowsourcedb ${SOURCEDB_LIBRARIES})
add_executable(edgemsoverview base/msoverview.cc base/MS.cc) add_executable(edgemsoverview base/msoverview.cc base/MS.cc)
target_link_libraries(edgemsoverview ${CASACORE_LIBRARIES} ${Boost_LIBRARIES}) 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 a script that warns users that EDGEDP3 is the new name of the executable
install( install(
...@@ -827,7 +828,8 @@ if(BUILD_TESTING) ...@@ -827,7 +828,8 @@ if(BUILD_TESTING)
if(BUILD_WITH_CUDA) if(BUILD_WITH_CUDA)
set_target_properties(unittests PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON) set_target_properties(unittests PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)
endif() 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. # Automatically (re)build the unit tests on every ctest run.
add_test(buildunittests ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target add_test(buildunittests ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
......
...@@ -25,9 +25,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/DetermineTargetCPU.cmake) ...@@ -25,9 +25,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/DetermineTargetCPU.cmake)
# Set package name: encode target CPU, if defined, in package name. # Set package name: encode target CPU, if defined, in package name.
if(DEFINED IDENTIFIED_TARGET_CPU) if(DEFINED IDENTIFIED_TARGET_CPU)
set(CPACK_PACKAGE_NAME "dp3-${IDENTIFIED_TARGET_CPU}") set(CPACK_PACKAGE_NAME "edgedp3-${IDENTIFIED_TARGET_CPU}")
else() else()
set(CPACK_PACKAGE_NAME "dp3") set(CPACK_PACKAGE_NAME "edgedp3")
endif() endif()
set(CPACK_PACKAGE_VENDOR "ASTRON") set(CPACK_PACKAGE_VENDOR "ASTRON")
...@@ -54,14 +54,14 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) ...@@ -54,14 +54,14 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
# Determine list of conflicting package names. Packages not built for current # Determine list of conflicting package names. Packages not built for current
# target CPU always conflict. # target CPU always conflict.
if(DEFINED IDENTIFIED_TARGET_CPU) if(DEFINED IDENTIFIED_TARGET_CPU)
set(_conflicts dp3) set(_conflicts edgedp3)
else() else()
set(_conflicts) set(_conflicts)
endif() endif()
foreach(_cpu ${KNOWN_TARGET_CPUS}) foreach(_cpu ${KNOWN_TARGET_CPUS})
if(NOT "${_cpu}" STREQUAL "${IDENTIFIED_TARGET_CPU}") if(NOT "${_cpu}" STREQUAL "${IDENTIFIED_TARGET_CPU}")
if("${_conflicts}" STREQUAL "") if("${_conflicts}" STREQUAL "")
set(_conflicts "dp3-${_cpu}") set(_conflicts "edgedp3-${_cpu}")
else() else()
set(_conflicts "${_conflicts}, dp3-${_cpu}") set(_conflicts "${_conflicts}, dp3-${_cpu}")
endif() endif()
......
...@@ -19,7 +19,8 @@ if(NOT EDGEDP3_VERSION) ...@@ -19,7 +19,8 @@ if(NOT EDGEDP3_VERSION)
set(EDGEDP3_VERSION_PATCH "${CMAKE_MATCH_3}") set(EDGEDP3_VERSION_PATCH "${CMAKE_MATCH_3}")
else() else()
message( 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()
endif() endif()
......
...@@ -32,5 +32,6 @@ target_link_libraries(fitters PRIVATE xtensor) ...@@ -32,5 +32,6 @@ target_link_libraries(fitters PRIVATE xtensor)
install(TARGETS parameterset pydp3 fitters install(TARGETS parameterset pydp3 fitters
DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3") DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3")
install(FILES __init__.py 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") install(FILES steps/queue.py DESTINATION "${PYTHON_INSTALL_DIR}/edgedp3/steps")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment