SearchInstalledSoftware.cmake (root_v6.26.08.source) | : | SearchInstalledSoftware.cmake (root_v6.26.10.source) | ||
---|---|---|---|---|
skipping to change at line 1070 | skipping to change at line 1070 | |||
if(NOT ARROW_FOUND) | if(NOT ARROW_FOUND) | |||
if(fail-on-missing) | if(fail-on-missing) | |||
message(FATAL_ERROR "Apache Arrow not found. Please set ARROW_HOME to poin t to your Arrow installation, " | message(FATAL_ERROR "Apache Arrow not found. Please set ARROW_HOME to poin t to your Arrow installation, " | |||
"or include the installation of Arrow in the CMAKE_PRE FIX_PATH.") | "or include the installation of Arrow in the CMAKE_PRE FIX_PATH.") | |||
else() | else() | |||
message(STATUS "Apache Arrow API not found. Set variable ARROW_HOME to poi nt to your Arrow installation, " | message(STATUS "Apache Arrow API not found. Set variable ARROW_HOME to poi nt to your Arrow installation, " | |||
"or include the installation of Arrow in the CMAKE_PREFIX_P ATH.") | "or include the installation of Arrow in the CMAKE_PREFIX_P ATH.") | |||
message(STATUS "For the time being switching OFF 'arrow' option") | message(STATUS "For the time being switching OFF 'arrow' option") | |||
set(arrow OFF CACHE BOOL "Disabled because Apache Arrow API not found (${a rrow_description})" FORCE) | set(arrow OFF CACHE BOOL "Disabled because Apache Arrow API not found (${a rrow_description})" FORCE) | |||
endif() | endif() | |||
else() | ||||
if(${ARROW_VERSION} VERSION_GREATER_EQUAL 10.0.0 AND CMAKE_CXX_STANDARD LESS | ||||
17) | ||||
if(fail-on-missing) | ||||
message(FATAL_ERROR "The Apache Arrow version found on the system (${ARR | ||||
OW_VERSION}) requires at least CMAKE_CXX_STANDARD=17") | ||||
else() | ||||
message(STATUS "The Apache Arrow version found on the system (${ARROW_VE | ||||
RSION}) requires at least CMAKE_CXX_STANDARD=17") | ||||
message(STATUS "For the time being switching OFF 'arrow' option") | ||||
set(arrow OFF CACHE BOOL "Disabled because Apache Arrow Version ${ARROW_ | ||||
VERSION} requires CMAKE_CXX_STANDARD=17)" FORCE) | ||||
endif() | ||||
endif() | ||||
endif() | endif() | |||
endif() | endif() | |||
#---Check for gfal-------------------------------------------------------------- ----- | #---Check for gfal-------------------------------------------------------------- ----- | |||
if(gfal) | if(gfal) | |||
find_package(GFAL) | find_package(GFAL) | |||
if(NOT GFAL_FOUND) | if(NOT GFAL_FOUND) | |||
if(fail-on-missing) | if(fail-on-missing) | |||
message(FATAL_ERROR "Gfal library not found and is required (gfal option e nabled)") | message(FATAL_ERROR "Gfal library not found and is required (gfal option e nabled)") | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 14 lines changed or added |