From: Ole Streicher Date: Tue, 18 Mar 2025 09:17:43 +0100 Subject: Don't fetch XTensor from git --- external/aocommon/CMakeLists.txt | 2 +- external/radler/external/aocommon/CMakeLists.txt | 2 +- external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt | 2 +- external/schaapcommon/CMakeLists.txt | 4 ---- external/schaapcommon/src/h5parm/CMakeLists.txt | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/external/aocommon/CMakeLists.txt b/external/aocommon/CMakeLists.txt index bb73cf3..fadfbca 100644 --- a/external/aocommon/CMakeLists.txt +++ b/external/aocommon/CMakeLists.txt @@ -103,7 +103,7 @@ target_link_libraries( ${CMAKE_THREAD_LIBS_INIT} ${CASACORE_LIBRARIES} ${CFITSIO_LIBRARY} - xtensor) + ) add_custom_target(execute_runtests_target ALL DEPENDS execute_runtests) add_custom_command( diff --git a/external/radler/external/aocommon/CMakeLists.txt b/external/radler/external/aocommon/CMakeLists.txt index f1c4e80..2bae621 100644 --- a/external/radler/external/aocommon/CMakeLists.txt +++ b/external/radler/external/aocommon/CMakeLists.txt @@ -100,7 +100,7 @@ target_link_libraries( ${CMAKE_THREAD_LIBS_INIT} ${CASACORE_LIBRARIES} ${CFITSIO_LIBRARY} - xtensor) + ) add_custom_target(execute_runtests_target ALL DEPENDS execute_runtests) add_custom_command( diff --git a/external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt b/external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt index 0c15984..6a505b5 100644 --- a/external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt +++ b/external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt @@ -25,7 +25,7 @@ find_package( target_include_directories(${SCHAAPCOMMON_PROJECT_NAME} SYSTEM PUBLIC ${CASACORE_INCLUDE_DIR}) target_link_libraries(${SCHAAPCOMMON_PROJECT_NAME} ${CASACORE_LIBRARIES} - xtensor) + ) get_directory_property(H5PARM_COMPILE_DEFINITIONS COMPILE_DEFINITIONS) if("XTENSOR_USE_XSIMD" IN_LIST H5PARM_COMPILE_DEFINITIONS) target_link_libraries(${SCHAAPCOMMON_PROJECT_NAME} xsimd) diff --git a/external/schaapcommon/CMakeLists.txt b/external/schaapcommon/CMakeLists.txt index 51fad48..8bd6e44 100644 --- a/external/schaapcommon/CMakeLists.txt +++ b/external/schaapcommon/CMakeLists.txt @@ -113,10 +113,6 @@ else() # - FetchXTensor.cmake should apply compiler directives to the entire project. # - FetchXTensor.cmake does not support duplicate inclusion. - # Fetch XTensor if it has not been fetched before. - if(NOT TARGET xtensor) - include(${CMAKE_SOURCE_DIR}/external/aocommon/CMake/FetchXTensor.cmake) - endif() # Compile in release mode if schaapcommon is included as external dependency. set(CMAKE_BUILD_TYPE Release) diff --git a/external/schaapcommon/src/h5parm/CMakeLists.txt b/external/schaapcommon/src/h5parm/CMakeLists.txt index 0c15984..6a505b5 100644 --- a/external/schaapcommon/src/h5parm/CMakeLists.txt +++ b/external/schaapcommon/src/h5parm/CMakeLists.txt @@ -25,7 +25,7 @@ find_package( target_include_directories(${SCHAAPCOMMON_PROJECT_NAME} SYSTEM PUBLIC ${CASACORE_INCLUDE_DIR}) target_link_libraries(${SCHAAPCOMMON_PROJECT_NAME} ${CASACORE_LIBRARIES} - xtensor) + ) get_directory_property(H5PARM_COMPILE_DEFINITIONS COMPILE_DEFINITIONS) if("XTENSOR_USE_XSIMD" IN_LIST H5PARM_COMPILE_DEFINITIONS) target_link_libraries(${SCHAAPCOMMON_PROJECT_NAME} xsimd)