File: atlas-name.patch

package info (click to toggle)
atlas-ecmwf 0.44.1-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 17,544 kB
  • sloc: cpp: 146,712; f90: 17,676; sh: 1,196; python: 379; makefile: 65
file content (582 lines) | stat: -rw-r--r-- 16,811 bytes parent folder | download
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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
Description: Set 'atlas-ecmwf' the name of the library in order
 to distinguish it from the other Atlas library
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2024-11-19
Forwarded: no

--- a/src/tests/parallel/CMakeLists.txt
+++ b/src/tests/parallel/CMakeLists.txt
@@ -10,7 +10,7 @@
   MPI        3
   CONDITION  eckit_HAVE_MPI
   SOURCES    test_haloexchange_adjoint.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -18,7 +18,7 @@
   MPI        3
   CONDITION  eckit_HAVE_MPI
   SOURCES    test_setcomm.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -26,7 +26,7 @@
   MPI        3
   CONDITION  eckit_HAVE_MPI
   SOURCES    test_haloexchange.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -34,7 +34,7 @@
   MPI        3
   CONDITION  eckit_HAVE_MPI AND atlas_HAVE_GPU
   SOURCES    test_haloexchange.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} ATLAS_RUN_NGPUS=1
 )
 if( TEST atlas_test_haloexchange_on_device )
@@ -45,7 +45,7 @@
   MPI        3
   CONDITION  eckit_HAVE_MPI
   SOURCES    test_gather.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -53,14 +53,14 @@
   MPI        3
   CONDITION  eckit_HAVE_MPI
   SOURCES    test_collect.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_omp_sort
   OMP        8
   SOURCES    test_omp_sort.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION  NOT SKIP_TEST_atlas_test_omp_sort
 )
@@ -68,7 +68,7 @@
 ecbuild_add_test( TARGET atlas_test_omp_copy
   OMP        8
   SOURCES    test_omp_copy.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
--- a/src/tests/trans/CMakeLists.txt
+++ b/src/tests/trans/CMakeLists.txt
@@ -1,4 +1,4 @@
-# (C) Copyright 2013 ECMWF.
+# (C) Copyright 2013 ECMWF
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
@@ -13,7 +13,7 @@
     add_fctest( TARGET atlas_fctest_trans
       LINKER_LANGUAGE Fortran
       SOURCES         fctest_trans.F90
-      LIBS            atlas_f
+      LIBS            atlas_ecmwf_f
       CONDITION       eckit_HAVE_MPI AND ( transi_HAVE_MPI OR ectrans_HAVE_MPI ) AND MPI_SLOTS GREATER_EQUAL 4
       MPI             4
       ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
@@ -24,7 +24,7 @@
     add_fctest( TARGET atlas_fctest_trans_invtrans_grad
       LINKER_LANGUAGE Fortran
       SOURCES         fctest_trans_invtrans_grad.F90
-      LIBS            atlas_f
+      LIBS            atlas_ecmwf_f
       ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
     )
   endif()
@@ -32,7 +32,7 @@
   add_fctest( TARGET atlas_fctest_trans_unstructured
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_trans_unstructured.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
   )
 
 endif()
@@ -41,21 +41,21 @@
   MPI      4
   SOURCES   test_trans.cc
   CONDITION atlas_HAVE_ECTRANS AND eckit_HAVE_MPI AND ( transi_HAVE_MPI OR ectrans_HAVE_MPI ) AND MPI_SLOTS GREATER_EQUAL 4
-  LIBS      atlas transi
+  LIBS      atlas_ecmwf transi
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_trans_serial
   SOURCES   test_trans.cc
   CONDITION atlas_HAVE_ECTRANS
-  LIBS      atlas transi
+  LIBS      atlas_ecmwf transi
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_trans_invtrans_grad
   SOURCES   test_trans_invtrans_grad.cc
   CONDITION atlas_HAVE_ECTRANS
-  LIBS      atlas transi
+  LIBS      atlas_ecmwf transi
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -67,20 +67,20 @@
 endif()
 ecbuild_add_test( TARGET atlas_test_transgeneral_fftw
   SOURCES   test_transgeneral.cc
-  LIBS      atlas ${atlas_test_transgeneral_extra_libs}
+  LIBS      atlas_ecmwf ${atlas_test_transgeneral_extra_libs}
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} ATLAS_TRACE_REPORT=1
   CONDITION atlas_HAVE_FFTW
 )
 ecbuild_add_test( TARGET atlas_test_transgeneral_pocketfft
   SOURCES   test_transgeneral.cc
-  LIBS      atlas ${atlas_test_transgeneral_extra_libs}
+  LIBS      atlas_ecmwf ${atlas_test_transgeneral_extra_libs}
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} ATLAS_TRACE_REPORT=1 ATLAS_LINALG_FFT_BACKEND=pocketfft
   CONDITION atlas_HAVE_POCKETFFT
 )
 
 ecbuild_add_test( TARGET atlas_test_trans_localcache
   SOURCES   test_trans_localcache.cc
-  LIBS      atlas
+  LIBS      atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} ATLAS_TRACE_REPORT=1
   CONDITION atlas_HAVE_ATLAS_TRANS
 )
--- a/cmake/atlas_export.cmake
+++ b/cmake/atlas_export.cmake
@@ -2,9 +2,9 @@
 # export package info
 
 if( TARGET atlas_f )
-  list( APPEND ATLAS_LIBRARIES atlas_f )
+  list( APPEND ATLAS_LIBRARIES atlas_ecmwf_f )
 endif()
-list( APPEND ATLAS_LIBRARIES  atlas )
+list( APPEND ATLAS_LIBRARIES  atlas_ecmwf )
 
 ################################################################################
 # pkg-config
@@ -15,21 +15,21 @@
 
 if( atlas_HAVE_PKGCONFIG )
   ecbuild_pkgconfig(
-    NAME             atlas
+    NAME             atlas-ecmwf
     LIBRARIES        ${ATLAS_LIBRARIES}
   )
 
   ecbuild_pkgconfig(
-    NAME             atlas-c++
+    NAME             atlas-ecmwf-c++
     LANGUAGES        CXX
-    LIBRARIES        atlas
+    LIBRARIES        atlas_ecmwf
   )
 
   if( atlas_HAVE_FORTRAN )
     ecbuild_pkgconfig(
-      NAME             atlas-fortran
+      NAME             atlas-ecmwf-fortran
       LANGUAGES        Fortran
-      LIBRARIES        atlas_f
+      LIBRARIES        atlas_ecmwf_f
       NO_PRIVATE_INCLUDE_DIRS
     )
   endif()
@@ -53,7 +53,7 @@
 endif()
 
 set( atlas_REQUIRES_PRIVATE_DEPENDENCIES FALSE )
-get_target_property( target_build_type atlas TYPE )
+get_target_property( target_build_type atlas_ecmwf TYPE )
 if( target_build_type STREQUAL STATIC_LIBRARY )
   set( atlas_REQUIRES_PRIVATE_DEPENDENCIES TRUE )
 endif()
--- a/src/tests/util/CMakeLists.txt
+++ b/src/tests/util/CMakeLists.txt
@@ -12,14 +12,14 @@
   add_fctest( TARGET atlas_fctest_functions
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_functions.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 
   add_fctest( TARGET atlas_fctest_logging
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_logging.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 
@@ -27,28 +27,28 @@
    CONDITION       NOT atlas_fctest_parametrisation_DISABLED
    LINKER_LANGUAGE Fortran
    SOURCES         fctest_parametrisation.F90
-   LIBS            atlas_f
+   LIBS            atlas_ecmwf_f
    ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 
   add_fctest( TARGET atlas_fctest_metadata
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_metadata.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 
  add_fctest( TARGET atlas_fctest_geometry
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_geometry.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 
   add_fctest( TARGET atlas_fctest_kdtree
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_kdtree.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 endif()
@@ -56,14 +56,14 @@
 foreach( test util earth flags polygon point )
   ecbuild_add_test( TARGET atlas_test_${test}
     SOURCES test_${test}.cc
-    LIBS atlas
+    LIBS atlas_ecmwf
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 endforeach()
 
 ecbuild_add_test( TARGET atlas_test_vector
   SOURCES  test_vector.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -71,32 +71,32 @@
   MPI        4
   CONDITION  eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 4
   SOURCES    test_metadata.cc
-  LIBS       atlas
+  LIBS       atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_kdtree
   SOURCES  test_kdtree.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION atlas_HAVE_ATLAS_GRID
 )
 
 ecbuild_add_test( TARGET atlas_test_convexsphericalpolygon
   SOURCES test_convexsphericalpolygon.cc
-  LIBS atlas
+  LIBS atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_unitsphere
   SOURCES test_unitsphere.cc
-  LIBS atlas
+  LIBS atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_pack_vector_fields
   SOURCES test_pack_vector_fields.cc
-  LIBS atlas
+  LIBS atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
--- a/src/tests/grid/CMakeLists.txt
+++ b/src/tests/grid/CMakeLists.txt
@@ -15,10 +15,10 @@
             fctest_stretchedrotatedgaussiangrid
             fctest_state )
 
-        add_fctest( TARGET atlas_${test} SOURCES ${test}.F90 LINKER_LANGUAGE Fortran LIBS atlas_f ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} )
+        add_fctest( TARGET atlas_${test} SOURCES ${test}.F90 LINKER_LANGUAGE Fortran LIBS atlas_ecmwf_f ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} )
 
     endforeach()
-    add_fctest( TARGET atlas_fctest_unstructuredgrid SOURCES fctest_unstructuredgrid.F90 LINKER_LANGUAGE Fortran LIBS atlas_f CONDITION HAVE_TESSELATION )
+    add_fctest( TARGET atlas_fctest_unstructuredgrid SOURCES fctest_unstructuredgrid.F90 LINKER_LANGUAGE Fortran LIBS atlas_ecmwf_f CONDITION HAVE_TESSELATION )
 endif()
 endif()
 
@@ -32,7 +32,7 @@
         test_largegrid
         test_grid_hash
         )
-    ecbuild_add_test( TARGET atlas_${test} SOURCES ${test}.cc LIBS atlas ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} )
+    ecbuild_add_test( TARGET atlas_${test} SOURCES ${test}.cc LIBS atlas_ecmwf ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} )
 endforeach()
 
 if( atlas_HAVE_ATLAS_FUNCTIONSPACE )
@@ -43,7 +43,7 @@
         test_cubedsphere
         test_cubedsphere_2
         )
-    ecbuild_add_test( TARGET atlas_${test} SOURCES ${test}.cc LIBS atlas ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} )
+    ecbuild_add_test( TARGET atlas_${test} SOURCES ${test}.cc LIBS atlas_ecmwf ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} )
 endforeach()
 endif()
 
@@ -55,7 +55,7 @@
 ecbuild_add_test( TARGET  atlas_test_distribution_regular_bands
   ${_WITH_MPI}
   SOURCES test_distribution_regular_bands.cc
-  LIBS atlas
+  LIBS atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION atlas_HAVE_ATLAS_FUNCTIONSPACE AND MPI_SLOTS GREATER_EQUAL 4
 )
--- a/doc/user-guide/core-functionalities/functionspace/CMakeLists.txt
+++ b/doc/user-guide/core-functionalities/functionspace/CMakeLists.txt
@@ -9,13 +9,13 @@
 ecbuild_add_executable(
   TARGET      atlas_c-NodeColumns
   SOURCES     NodeColumns.cc
-  LIBS        atlas
+  LIBS        atlas_ecmwf
   NOINSTALL )
 
 ecbuild_add_executable(
   TARGET      atlas_c-StructuredColumns
   SOURCES     StructuredColumns.cc
-  LIBS        atlas
+  LIBS        atlas_ecmwf
   NOINSTALL )
 
 set_target_properties(atlas_c-NodeColumns
@@ -27,7 +27,7 @@
 ecbuild_add_executable(
   TARGET      atlas_f-NodeColumns
   SOURCES     NodeColumns.F90
-  LIBS        atlas_f
+  LIBS        atlas_ecmwf_f
   LINKER_LANGUAGE Fortran
   NOINSTALL )
 
--- a/doc/user-guide/core-functionalities/meshes/CMakeLists.txt
+++ b/doc/user-guide/core-functionalities/meshes/CMakeLists.txt
@@ -9,7 +9,7 @@
 ecbuild_add_executable(
   TARGET      atlas_c-meshes-Structured
   SOURCES     meshes-Structured.cc
-  LIBS        atlas
+  LIBS        atlas_ecmwf
   NOINSTALL )
 
 set_target_properties(atlas_c-meshes-Structured
@@ -20,7 +20,7 @@
 ecbuild_add_executable(
   TARGET      atlas_f-meshes-Structured
   SOURCES     meshes-Structured.F90
-  LIBS        atlas_f
+  LIBS        atlas_ecmwf_f
   LINKER_LANGUAGE Fortran
   NOINSTALL )
 
--- a/src/tests/functionspace/CMakeLists.txt
+++ b/src/tests/functionspace/CMakeLists.txt
@@ -18,7 +18,7 @@
     CONDITION       eckit_HAVE_MPI AND (transi_HAVE_MPI OR ectrans_HAVE_MPI) AND MPI_SLOTS GREATER_EQUAL 4
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_functionspace.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   )
 
@@ -27,7 +27,7 @@
     CONDITION       eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 4
     LINKER_LANGUAGE Fortran
     SOURCES         fctest_blockstructuredcolumns.F90
-    LIBS            atlas_f
+    LIBS            atlas_ecmwf_f
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -35,7 +35,7 @@
 
 ecbuild_add_test( TARGET atlas_test_functionspace
   SOURCES  test_functionspace.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -43,14 +43,14 @@
   MPI         4
   CONDITION   eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 4
   SOURCES     test_functionspace_splitcomm.cc
-  LIBS        atlas
+  LIBS        atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 
 ecbuild_add_test( TARGET atlas_test_cellcolumns
   SOURCES  test_cellcolumns.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
@@ -58,13 +58,13 @@
   MPI        8
   CONDITION  eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 8
   SOURCES test_cubedsphere_functionspace.cc
-  LIBS atlas
+  LIBS atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_structuredcolumns_biperiodic
   SOURCES  test_structuredcolumns_biperiodic.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   MPI 5
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 5
@@ -72,14 +72,14 @@
 
 ecbuild_add_test( TARGET test_structuredcolumns_regional
   SOURCES  test_structuredcolumns_regional.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 
 ecbuild_add_test( TARGET atlas_test_structuredcolumns
   SOURCES  test_structuredcolumns.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   MPI 5
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 5
@@ -88,14 +88,14 @@
 ecbuild_add_test( TARGET atlas_test_blockstructuredcolumns
   MPI        3
   SOURCES  test_blockstructuredcolumns.cc
-  LIBS     atlas
+ LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND MPI_SLOTS GREATER_EQUAL 3
 )
 
 ecbuild_add_test( TARGET atlas_test_pointcloud
   SOURCES  test_pointcloud.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   MPI 2
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND NOT HAVE_GRIDTOOLS_STORAGE
@@ -104,7 +104,7 @@
 
 ecbuild_add_test( TARGET atlas_test_pointcloud_halo_creation
   SOURCES  test_pointcloud_halo_creation.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   MPI 4
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND NOT HAVE_GRIDTOOLS_STORAGE AND MPI_SLOTS GREATER_EQUAL 4
@@ -112,7 +112,7 @@
 
 ecbuild_add_test( TARGET atlas_test_pointcloud_he_2PE
   SOURCES  test_pointcloud_haloexchange_2PE.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   MPI 2
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND NOT HAVE_GRIDTOOLS_STORAGE
@@ -120,7 +120,7 @@
 
 ecbuild_add_test( TARGET atlas_test_pointcloud_he_3PE
   SOURCES  test_pointcloud_haloexchange_3PE.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   MPI 3
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
   CONDITION eckit_HAVE_MPI AND NOT HAVE_GRIDTOOLS_STORAGE
@@ -128,19 +128,19 @@
 
 ecbuild_add_test( TARGET atlas_test_reduced_halo
   SOURCES test_reduced_halo.cc
-  LIBS    atlas
+  LIBS    atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_test( TARGET atlas_test_stencil
   SOURCES  test_stencil.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )
 
 ecbuild_add_executable( TARGET atlas_test_stencil_parallel
   SOURCES  test_stencil_parallel.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   NOINSTALL
 )
 
@@ -165,7 +165,7 @@
 
 ecbuild_add_executable( TARGET atlas_test_polygons
   SOURCES  test_polygons.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   NOINSTALL
 )
 
@@ -183,7 +183,7 @@
 
 ecbuild_add_executable( TARGET atlas_test_polygons_projection
   SOURCES  test_polygons_projection.cc
-  LIBS     atlas
+  LIBS     atlas_ecmwf
   NOINSTALL
 )
 
@@ -203,7 +203,7 @@
 ecbuild_add_test( TARGET  atlas_test_structuredcolumns_haloexchange
   ${_WITH_MPI}
   SOURCES test_structuredcolumns_haloexchange.cc
-  LIBS atlas
+  LIBS atlas_ecmwf
   ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT}
 )