Skip to content

Commit 6c1f5d9

Browse files
committed
[GenVectorX] Change cmake adaptivecpp config
1 parent af8ce06 commit 6c1f5d9

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

.github/workflows/root-ci-config/buildconfig/fedora42.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ experimental_adaptivecpp=ON
77
experimental_genvectorx=ON
88
pythia8=OFF
99
unuran=OFF
10-
vdt=OFF
10+
vdt=OFF

.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ sqlite=OFF
1616
test_distrdf_dask=OFF
1717
test_distrdf_pyspark=OFF
1818
unfold=OFF
19-
webgui=ON
19+
webgui=ON

.github/workflows/root-ci-config/buildconfig/ubuntu2404.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ experimental_adaptivecpp=ON
22
experimental_genvectorx=ON
33
pythia8=OFF
44
tmva-sofie=ON
5-
ccache=On
5+
ccache=On
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
experimental_adaptivecpp=ON
22
experimental_genvectorx=ON
33
ccache=ON
4-
pythia8=OFF
4+
pythia8=OFF

cmake/modules/SearchInstalledSoftware.cmake

+13-10
Original file line numberDiff line numberDiff line change
@@ -1643,8 +1643,11 @@ if (vecgeom)
16431643
endif()
16441644
endif()
16451645

1646-
#---Check for AdaptiveCpp-------------------------------------------------------------------
1646+
if(experimental_builtin_adaptivecpp)
1647+
ROOT_CHECK_CONNECTION_AND_DISABLE_OPTION("experimental_builtin_adaptivecpp")
1648+
endif()
16471649

1650+
#---Check for AdaptiveCpp-------------------------------------------------------------------
16481651
if (experimental_adaptivecpp OR experimental_builtin_adaptivecpp)
16491652
if (experimental_oneapi)
16501653
message(WARNING "Disable OneAPI to load AdaptiveCpp")
@@ -1656,16 +1659,16 @@ if (experimental_adaptivecpp OR experimental_builtin_adaptivecpp)
16561659
find_package(AdaptiveCpp)
16571660

16581661
if(NOT AdaptiveCpp_FOUND)
1659-
if(fail-on-missing)
1660-
message(FATAL_ERROR "AdaptiveCpp not found. Ensure that the installation of AdaptiveCpp is in the CMAKE_PREFIX_PATH")
1661-
else()
1662-
message(STATUS "AdaptiveCpp not found. Ensure that the installation of AdaptiveCpp is in the CMAKE_PREFIX_PATH")
1663-
if(NO_CONNECTION)
1664-
set(experimental_adaptivecpp OFF CACHE BOOL "Disabled because not found and no internet connection" FORCE)
1665-
else()
1666-
message(STATUS " Switching ON 'experimental_builtin_adaptivecpp' option")
1667-
set(experimental_builtin_adaptivecpp ON CACHE BOOL "Enabled because external AdaptiveCpp not found" FORCE)
1662+
message(STATUS "AdaptiveCpp not found. Ensure that the installation of AdaptiveCpp is in the CMAKE_PREFIX_PATH")
1663+
if(NO_CONNECTION)
1664+
set(experimental_builtin_adaptivecpp OFF CACHE BOOL "Disabled because not found and no internet connection" FORCE)
1665+
set(sycl OFF CACHE BOOL FORCE)
1666+
if(fail-on-missing)
1667+
message(FATAL_ERROR "AdaptiveCpp cannot be built.")
16681668
endif()
1669+
else()
1670+
message(STATUS " Switching ON 'experimental_builtin_adaptivecpp' option")
1671+
set(experimental_builtin_adaptivecpp ON CACHE BOOL "Enabled because external AdaptiveCpp not found" FORCE)
16691672
endif()
16701673
endif()
16711674
endif()

0 commit comments

Comments
 (0)