diff --git a/cmake/modules/DownloadAndCheck.cmake b/cmake/modules/DownloadAndCheck.cmake index b83a6cd0890..c8ab62b5feb 100644 --- a/cmake/modules/DownloadAndCheck.cmake +++ b/cmake/modules/DownloadAndCheck.cmake @@ -1,4 +1,4 @@ -MACRO(DOWNLOAD_AND_CHECK source destination) +MACRO(download_and_check source destination) file(DOWNLOAD ${source} ${destination} STATUS download_status) list(GET download_status 0 status_code) list(GET download_status 1 status_message) diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt index e7fbc1ae3e1..57d74407341 100644 --- a/wpimath/CMakeLists.txt +++ b/wpimath/CMakeLists.txt @@ -25,19 +25,19 @@ if (WITH_JAVA) message(STATUS "Downloading EJML jarfiles...") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-cdense/0.42/ejml-cdense-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-cdense/0.42/ejml-cdense-0.42.jar" "${JAR_ROOT}/ejml-cdense-0.42.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-core/0.42/ejml-core-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-core/0.42/ejml-core-0.42.jar" "${JAR_ROOT}/ejml-core-0.42.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-ddense/0.42/ejml-ddense-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-ddense/0.42/ejml-ddense-0.42.jar" "${JAR_ROOT}/ejml-ddense-0.42.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-dsparse/0.42/ejml-dsparse-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-dsparse/0.42/ejml-dsparse-0.42.jar" "${JAR_ROOT}/ejml-dsparse-0.42.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-fdense/0.42/ejml-fdense-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-fdense/0.42/ejml-fdense-0.42.jar" "${JAR_ROOT}/ejml-fdense-0.42.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-simple/0.42/ejml-simple-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-simple/0.42/ejml-simple-0.42.jar" "${JAR_ROOT}/ejml-simple-0.42.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}org/ejml/ejml-zdense/0.42/ejml-zdense-0.42.jar" + download_and_check("${BASE_URL}org/ejml/ejml-zdense/0.42/ejml-zdense-0.42.jar" "${JAR_ROOT}/ejml-zdense-0.42.jar") message(STATUS "All files downloaded.") diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt index 595e86b82e7..f9c98b6af12 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt @@ -21,11 +21,11 @@ if (WITH_JAVA) message(STATUS "Downloading Jackson jarfiles...") - DOWNLOAD_AND_CHECK("${BASE_URL}com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar" + download_and_check("${BASE_URL}com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar" "${JAR_ROOT}/jackson-core-2.15.2.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.jar" + download_and_check("${BASE_URL}com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.jar" "${JAR_ROOT}/jackson-databind-2.15.2.jar") - DOWNLOAD_AND_CHECK("${BASE_URL}com/fasterxml/jackson/core/jackson-annotations/2.15.2/jackson-annotations-2.15.2.jar" + download_and_check("${BASE_URL}com/fasterxml/jackson/core/jackson-annotations/2.15.2/jackson-annotations-2.15.2.jar" "${JAR_ROOT}/jackson-annotations-2.15.2.jar") message(STATUS "All files downloaded.")