Skip to content

Don't require git to download external projects #1480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nealrichardson wants to merge 1 commit into from
Closed

Don't require git to download external projects #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions third-party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ set(AWS_DEPS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Dependencies inst
set(AWS_DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies build directory.")
set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies download directory.")

set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git")
set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common")
set(AWS_C_COMMON_TAG "v0.4.42")
include(BuildAwsCCommon)

set(AWS_CHECKSUMS_URL "https://github.com/awslabs/aws-checksums.git")
set(AWS_CHECKSUMS_URL "https://github.com/awslabs/aws-checksums")
set(AWS_CHECKSUMS_TAG "v0.1.5")
include(BuildAwsChecksums)

set(AWS_EVENT_STREAM_URL "https://github.com/awslabs/aws-c-event-stream.git")
set(AWS_EVENT_STREAM_URL "https://github.com/awslabs/aws-c-event-stream")
set(AWS_EVENT_STREAM_TAG "v0.1.5")
include(BuildAwsEventStream)

add_dependencies(AwsCEventStream AwsCCommon AwsChecksums)
add_dependencies(AwsCEventStream AwsCCommon AwsChecksums)
9 changes: 3 additions & 6 deletions third-party/cmake/BuildAwsCCommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
if(TARGET_ARCH STREQUAL "ANDROID")
ExternalProject_Add(AwsCCommon
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_C_COMMON_URL}
GIT_TAG ${AWS_C_COMMON_TAG}
URL "${AWS_C_COMMON_URL}/archive/${AWS_C_COMMON_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -21,8 +20,7 @@ elseif(TARGET_ARCH STREQUAL "APPLE" AND DEFINED CMAKE_OSX_ARCHITECTURES AND NOT
message("Cross compiling aws-c-common for architecture ${CMAKE_OSX_ARCHITECTURES}")
ExternalProject_Add(AwsCCommon
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_C_COMMON_URL}
GIT_TAG ${AWS_C_COMMON_TAG}
URL "${AWS_C_COMMON_URL}/archive/${AWS_C_COMMON_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -38,8 +36,7 @@ elseif(TARGET_ARCH STREQUAL "APPLE" AND DEFINED CMAKE_OSX_ARCHITECTURES AND NOT
else()
ExternalProject_Add(AwsCCommon
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_C_COMMON_URL}
GIT_TAG ${AWS_C_COMMON_TAG}
URL "${AWS_C_COMMON_URL}/archive/${AWS_C_COMMON_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand Down
11 changes: 3 additions & 8 deletions third-party/cmake/BuildAwsChecksums.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
if(TARGET_ARCH STREQUAL "ANDROID")
ExternalProject_Add(AwsChecksums
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_CHECKSUMS_URL}
GIT_TAG ${AWS_CHECKSUMS_TAG}
URL "${AWS_CHECKSUMS_URL}/archive/${AWS_CHECKSUMS_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -20,8 +19,7 @@ elseif(TARGET_ARCH STREQUAL "APPLE" AND DEFINED CMAKE_OSX_ARCHITECTURES AND NOT
message("Cross compiling aws-checksums for architecture ${CMAKE_OSX_ARCHITECTURES}")
ExternalProject_Add(AwsChecksums
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_CHECKSUMS_URL}
GIT_TAG ${AWS_CHECKSUMS_TAG}
URL "${AWS_CHECKSUMS_URL}/archive/${AWS_CHECKSUMS_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -37,8 +35,7 @@ elseif(TARGET_ARCH STREQUAL "APPLE" AND DEFINED CMAKE_OSX_ARCHITECTURES AND NOT
else()
ExternalProject_Add(AwsChecksums
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_CHECKSUMS_URL}
GIT_TAG ${AWS_CHECKSUMS_TAG}
URL "${AWS_CHECKSUMS_URL}/archive/${AWS_CHECKSUMS_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -50,5 +47,3 @@ else()
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)
endif()


9 changes: 3 additions & 6 deletions third-party/cmake/BuildAwsEventStream.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set(DEPS_RPATH "$ORIGIN")
if(TARGET_ARCH STREQUAL "ANDROID")
ExternalProject_Add(AwsCEventStream
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_EVENT_STREAM_URL}
GIT_TAG ${AWS_EVENT_STREAM_TAG}
URL "${AWS_EVENT_STREAM_URL}/archive/${AWS_EVENT_STREAM_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -26,8 +25,7 @@ elseif(TARGET_ARCH STREQUAL "APPLE" AND DEFINED CMAKE_OSX_ARCHITECTURES AND NOT
message("Cross compiling aws-c-event-stream for architecture ${CMAKE_OSX_ARCHITECTURES}")
ExternalProject_Add(AwsCEventStream
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_EVENT_STREAM_URL}
GIT_TAG ${AWS_EVENT_STREAM_TAG}
URL "${AWS_EVENT_STREAM_URL}/archive/${AWS_EVENT_STREAM_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand All @@ -45,8 +43,7 @@ elseif(TARGET_ARCH STREQUAL "APPLE" AND DEFINED CMAKE_OSX_ARCHITECTURES AND NOT
else()
ExternalProject_Add(AwsCEventStream
PREFIX ${AWS_DEPS_BUILD_DIR}
GIT_REPOSITORY ${AWS_EVENT_STREAM_URL}
GIT_TAG ${AWS_EVENT_STREAM_TAG}
URL "${AWS_EVENT_STREAM_URL}/archive/${AWS_EVENT_STREAM_TAG}.tar.gz"
BUILD_IN_SOURCE 0
UPDATE_COMMAND ""
CMAKE_ARGS
Expand Down