From 8b4130034ddc46b48335209c949e3b1752c4a0be Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 16 May 2022 19:29:27 +0800 Subject: [PATCH] revert: cmake git submodule for2.4 (#12542) * enh: cmake git submodule for 2.4 [TD-15342] * enh: cmake git submodule use community dir var [TD-15342] * revert to 990092ce3d98b993cdfbb948ee7490b200bea800 for 2.4 --- cmake/env.inc | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/cmake/env.inc b/cmake/env.inc index 69ff1ee7ae..1c594cd4be 100755 --- a/cmake/env.inc +++ b/cmake/env.inc @@ -19,25 +19,6 @@ MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR}) MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH}) MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH}) -find_package(Git QUIET) -if(GIT_FOUND AND EXISTS "${TD_COMMUNITY_DIR}/.git") -# Update submodules as needed - option(GIT_SUBMODULE "Check submodules during build" ON) - if(GIT_SUBMODULE) - message(STATUS "Submodule update") - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE GIT_SUBMOD_RESULT) - if(NOT GIT_SUBMOD_RESULT EQUAL "0") - message(WARNING "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") - endif() - endif() -endif() - -if(NOT EXISTS "${TD_COMMUNITY_DIR}/deps/jemalloc/Makefile.in") - message(WARNING "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules manually if you need build them.") -endif() - IF (TD_BUILD_JDBC) FIND_PROGRAM(TD_MVN_INSTALLED mvn) IF (TD_MVN_INSTALLED) -- GitLab