cmake: cleanup
This commit is contained in:
@@ -65,6 +65,7 @@ if(BUILD_ZLIB)
|
||||
ZLIB
|
||||
GIT_REPOSITORY "https://github.com/madler/ZLIB.git"
|
||||
GIT_TAG "v1.3.1"
|
||||
GIT_SHALLOW TRUE
|
||||
PATCH_COMMAND git apply --ignore-whitespace
|
||||
"${CMAKE_CURRENT_LIST_DIR}/../../patches/ZLIB-v1.3.1.patch")
|
||||
FetchContent_MakeAvailable(ZLIB)
|
||||
|
||||
@@ -5,7 +5,8 @@ FROM ubuntu:latest AS env
|
||||
# Install system build dependencies
|
||||
ENV PATH=/usr/local/bin:$PATH
|
||||
RUN apt-get update -qq \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
|
||||
git wget libssl-dev build-essential \
|
||||
cmake ninja-build python3 python3-venv pkgconf libglib2.0-dev \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
@@ -108,7 +108,8 @@ FetchContent_Declare(
|
||||
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
|
||||
GIT_TAG "20250127.1"
|
||||
GIT_SHALLOW TRUE
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20250127.1.patch"
|
||||
PATCH_COMMAND git apply --ignore-whitespace
|
||||
"${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20250127.1.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(absl)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
@@ -127,7 +128,8 @@ FetchContent_Declare(
|
||||
GIT_TAG "v30.2"
|
||||
GIT_SHALLOW TRUE
|
||||
GIT_SUBMODULES ""
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v30.2.patch"
|
||||
PATCH_COMMAND git apply --ignore-whitespace
|
||||
"${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v30.2.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(protobuf)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
|
||||
Reference in New Issue
Block a user