Skip to content

Commit 4c22974

Browse files
committed
[GenVectorX] Change cmake adaptivecpp config
1 parent c98c1ff commit 4c22974

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

cmake/modules/SearchInstalledSoftware.cmake

+8-4
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")
@@ -1661,7 +1664,8 @@ if (experimental_adaptivecpp OR experimental_builtin_adaptivecpp)
16611664
else()
16621665
message(STATUS "AdaptiveCpp not found. Ensure that the installation of AdaptiveCpp is in the CMAKE_PREFIX_PATH")
16631666
if(NO_CONNECTION)
1664-
set(experimental_adaptivecpp OFF CACHE BOOL "Disabled because not found and no internet connection" FORCE)
1667+
set(experimental_builtin_adaptivecpp OFF CACHE BOOL "Disabled because not found and no internet connection" FORCE)
1668+
set(sycl OFF CACHE BOOL FORCE)
16651669
else()
16661670
message(STATUS " Switching ON 'experimental_builtin_adaptivecpp' option")
16671671
set(experimental_builtin_adaptivecpp ON CACHE BOOL "Enabled because external AdaptiveCpp not found" FORCE)
@@ -1678,8 +1682,8 @@ if (experimental_adaptivecpp OR experimental_builtin_adaptivecpp)
16781682
set(ADAPTIVE_CPP_SOURCE_DIR "${CMAKE_BINARY_DIR}/AdaptiveCpp")
16791683
FetchContent_Declare(
16801684
AdaptiveCpp
1681-
GIT_REPOSITORY https://github.com/devajithvs/AdaptiveCpp.git
1682-
GIT_TAG 3fb375fdc84ad0423139e05167739e9e906ca183
1685+
GIT_REPOSITORY https://github.com/AdaptiveCpp/AdaptiveCpp.git
1686+
GIT_TAG 7677cf6eefd8ab46d66168cd07ab042109448124
16831687
)
16841688
FetchContent_GetProperties(AdaptiveCpp)
16851689
if(NOT AdaptiveCpp_POPULATED)

0 commit comments

Comments
 (0)