1 Submodule 3rd_party/bergamot-translator contains modified content
2 Submodule 3rd_party/marian-dev contains modified content
3 diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake
4 index 31352565..d90a366d 100644
5 --- a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake
6 +++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake
7 @@ -22,10 +22,8 @@ else()
10 # Get current commit SHA from git
11 -execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
12 - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
13 - OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA
14 - OUTPUT_STRIP_TRAILING_WHITESPACE)
15 +# (dummy value for nix package without the .git)
16 +set(PROJECT_VERSION_GIT_SHA 000000000000)
18 # Get partial versions into a list
19 string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST
20 diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt
21 index 76aa0e2b..ca982bd3 100644
22 --- a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt
23 +++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt
24 @@ -149,23 +149,8 @@ target_compile_options(marian PRIVATE ${ALL_WARNINGS})
26 # We set MARIAN_GIT_DIR to the appropriate path, depending on whether
27 # ${CMAKE_CURRENT_SOURCE_DIR}/../.git is a directory or file.
28 -set(MARIAN_GIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
29 -if(NOT IS_DIRECTORY ${MARIAN_GIT_DIR}) # i.e., it's a submodule
30 - file(READ ${MARIAN_GIT_DIR} MARIAN_GIT_DIR)
31 - string(REGEX REPLACE "gitdir: (.*)\n" "\\1" MARIAN_GIT_DIR ${MARIAN_GIT_DIR})
32 - if(NOT IS_ABSOLUTE ${MARIAN_GIT_DIR})
33 - get_filename_component(MARIAN_GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${MARIAN_GIT_DIR}" ABSOLUTE)
35 -endif(NOT IS_DIRECTORY ${MARIAN_GIT_DIR})
37 -add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h
38 - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
39 - COMMAND git log -1 --pretty=format:\#define\ GIT_REVISION\ \"\%h\ \%ai\" > ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h
40 - DEPENDS ${MARIAN_GIT_DIR}/logs/HEAD
43 -add_custom_target(marian_version DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h)
44 -add_dependencies(marian marian_version) # marian must depend on it so that it gets created first
45 +# (generated by nix package instead)
47 # make sure all local dependencies are installed first before this is built
48 add_dependencies(marian 3rd_party_installs)
50 diff --git a/cmake/GetVersionFromFile.cmake b/cmake/GetVersionFromFile.cmake
51 index 83b7975..71cd861 100644
52 --- a/cmake/GetVersionFromFile.cmake
53 +++ b/cmake/GetVersionFromFile.cmake
54 @@ -23,10 +23,8 @@ else()
57 # Get current commit SHA from git
58 -execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
59 - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
60 - OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA
61 - OUTPUT_STRIP_TRAILING_WHITESPACE)
62 +# (dummy value for nix package without the .git)
63 +set(PROJECT_VERSION_GIT_SHA 000000000000)
65 # Get partial versions into a list
66 string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST