Skip to content
Snippets Groups Projects
Commit d979637f authored by Timur Safin's avatar Timur Safin Committed by Kirill Yukhin
Browse files

build: submodule third_party/tz instead of git

FreeBSD Tarantool port has some problems if build uses cmake'
ExternalProject_Add which refers to the github repository.
Sumodule works better - so switching to using it.

NO_CHANGELOG=build
NO_DOC=build
NO_TEST=build

(cherry picked from commit 4eaff4e0)
parent dfd02088
No related branches found
No related tags found
No related merge requests found
......@@ -60,3 +60,6 @@
path = third_party/libunwind
url = https://github.com/tarantool/libunwind.git
branch = libunwind-1.6.2-tarantool
[submodule "third_party/tz"]
path = third_party/tz
url = https://github.com/tarantool/tz.git
......@@ -3,8 +3,9 @@ add_library(tzcode STATIC
target_link_libraries(tzcode)
set(TZCODE_PROJECT tzcode-iana)
set(TZCODE_BINARY_DIR ${PROJECT_BINARY_DIR}/build/${TZCODE_PROJECT}/work)
set(TZCODE_SOURCE_DIR ${PROJECT_BINARY_DIR}/build/${TZCODE_PROJECT}/src)
set(TZCODE_BINARY_DIR ${PROJECT_BINARY_DIR}/build/${TZCODE_PROJECT})
set(TZCODE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party/tz)
set(TZDATA_TARGET main.zi)
set(TZDATA_FULL_TARGET ${TZCODE_SOURCE_DIR}/${TZDATA_TARGET})
......@@ -13,17 +14,10 @@ set(TZCODE_SRC ${PROJECT_SOURCE_DIR}/src/lib/tzcode)
set(TZLUA_SRC ${PROJECT_SOURCE_DIR}/src/lua)
ExternalProject_Add(${TZCODE_PROJECT}
GIT_REPOSITORY https://github.com/tarantool/tz
GIT_TAG 2022a
GIT_SHALLOW YES
EXCLUDE_FROM_ALL 1
DOWNLOAD_DIR ${TZCODE_BINARY_DIR}
TMP_DIR ${TZCODE_BINARY_DIR}/tmp
STAMP_DIR ${TZCODE_BINARY_DIR}/stamp
# git will fail if directory is not empty - thus source should be
# different than any other directory involved, i.e. ${TZCODE_BINARY_DIR}
# and ${TZCODE_SOURCE_DIR} should not be intersecting.
SOURCE_DIR ${TZCODE_SOURCE_DIR}
UPDATE_COMMAND ""
......
Subproject commit 95ecc37d29c2f5cf711af43b0ef3a35fc2847aa1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment