Commit a1cc935e authored by Aaron Bray's avatar Aaron Bray
Browse files

CMake Updates

- Add more url's for baseline retries
- Correct Dirent config
- Correct a few script paths
parent 50b630c9
......@@ -98,9 +98,9 @@ elseif(TYPE STREQUAL "protoc")
-DPulse_PYTHON_API:BOOL=@Pulse_PYTHON_API@
-P "@CMAKE_SOURCE_DIR@/src/schema/GenerateBindings.cmake")
elseif(TYPE STREQUAL "updateBaselines")
execute_process(COMMAND ${CMAKE_COMMAND} --build "@CMAKE_CURRENT_BINARY_DIR@" --target UpdateVerification)
execute_process(COMMAND ${CMAKE_COMMAND} --build "@CMAKE_CURRENT_BINARY_DIR@/data" --target UpdateVerification)
elseif(TYPE STREQUAL "jar")
execute_process(COMMAND ${CMAKE_COMMAND} --build "@CMAKE_CURRENT_BINARY_DIR@" --target PulseJava)
execute_process(COMMAND ${CMAKE_COMMAND} --build "@CMAKE_CURRENT_BINARY_DIR@/src/java" --target PulseJava)
elseif(TYPE STREQUAL "rebase")
# find Git and if available set GIT_HASH variable
find_package(Git QUIET)
......
......@@ -7,7 +7,7 @@ add_external_project_ex( Dirent
URL "https://github.com/tronkko/dirent/archive/1.23.2.zip"
URL_HASH MD5=43514791ab73ef5ac7c490afc7c3bab2
CMAKE_CACHE_ARGS
-DDIRENT_BUILD_TESTS :BOOL=OFF
-DDIRENT_BUILD_TESTS:BOOL=OFF
RELATIVE_INCLUDE_PATH ""
DEPENDENCIES ""
#VERBOSE
......
# External Data
include(ExternalData)
set(ExternalData_URL_TEMPLATES "https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download")
# Putting in the same URL to ensure bad connections retry a few times
set(ExternalData_URL_TEMPLATES "https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download"
"https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download"
"https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download")
message(STATUS "Looking for zip shas")
file(GLOB_RECURSE _VERIFICATION_SHA RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.sha512")
......@@ -22,7 +25,7 @@ endforeach()
ExternalData_Add_Target(ExternalData)
set(ExternalData_LINK_CONTENT SHA512)
set(ExternalData_TIMEOUT_ABSOLUTE 300)
set(ExternalData_TIMEOUT_INACTIVITY 60)
set(ExternalData_TIMEOUT_INACTIVITY 150)
set(INC_DOWNLOAD)
if(PULSE_DOWNLOAD_BASELINES)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment