blob: f7e547511e7382df2b108163f40e241c86b257a8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
diff -up ./submodules/CMakeLists.txt.old ./submodules/CMakeLists.txt
--- ./submodules/CMakeLists.txt.old 2025-09-05 12:28:45.588076443 +0200
+++ ./submodules/CMakeLists.txt 2025-09-05 12:28:57.141504699 +0200
@@ -22,7 +22,7 @@ set(MODULE_GOOGLE_TEST "googletest")
set(MODULES_INSTALL_PREFIX "${MODULES_DIR}/install")
-find_program(_GIT_EXE git REQUIRED)
+find_program(_GIT_EXE git)
# On some distros (mainly RedHat based) the cmake files might be installed under
# lib64/ and not under lib/, this function helps locating the cmake path for the
@@ -152,7 +152,7 @@ if(WITH_SUBMODULES_SYSTEM)
else()
# Pull submodules with a given branch / tag and build them
checkout_submodule_branch(${MODULE_GRPC} "https://github.com/grpc/grpc"
- "v1.70.1" "${MODULES_DIR}/grpc/build-release")
+ "v1.70.1" "${MODULES_DIR}/grpc")
string(FIND "${DISTRO_NAME}" "alpine" POSITION)
if(POSITION GREATER -1)
@@ -173,7 +173,7 @@ else()
checkout_submodule_branch(
${MODULE_GOOGLE_TEST} "https://github.com/google/googletest.git" "main"
- "${MODULES_DIR}/googletest/build-release")
+ "${MODULES_DIR}/googletest")
set(MODULES_COMMON_CMAKE_ARGS
"-DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${MODULES_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=20"
|
