1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From: Ole Streicher <olebole@debian.org>
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 dc66df1..e0a0d95 100644
--- a/external/aocommon/CMakeLists.txt
+++ b/external/aocommon/CMakeLists.txt
@@ -97,7 +97,7 @@ add_executable(
tests/avx/tMatrixComplexDouble2x2.cpp
tests/avx/tMatrixComplexFloat2x2.cpp)
target_link_libraries(runtests ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
- ${CASACORE_LIBRARIES} ${CFITSIO_LIBRARY} xtensor)
+ ${CASACORE_LIBRARIES} ${CFITSIO_LIBRARY})
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 dc66df1..e0a0d95 100644
--- a/external/radler/external/aocommon/CMakeLists.txt
+++ b/external/radler/external/aocommon/CMakeLists.txt
@@ -97,7 +97,7 @@ add_executable(
tests/avx/tMatrixComplexDouble2x2.cpp
tests/avx/tMatrixComplexFloat2x2.cpp)
target_link_libraries(runtests ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
- ${CASACORE_LIBRARIES} ${CFITSIO_LIBRARY} xtensor)
+ ${CASACORE_LIBRARIES} ${CFITSIO_LIBRARY})
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 125ea66..a4e7c0a 100644
--- a/external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt
+++ b/external/radler/external/schaapcommon/src/h5parm/CMakeLists.txt
@@ -23,7 +23,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 45cc1c0..a4c2a73 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 125ea66..a4e7c0a 100644
--- a/external/schaapcommon/src/h5parm/CMakeLists.txt
+++ b/external/schaapcommon/src/h5parm/CMakeLists.txt
@@ -23,7 +23,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)
|
