Skip to content

Commit 900a8c3

Browse files
Include LDPK v2.8 archive to speed up build times.
This is a cached version of LDPK, from the following URL: https://www.3dequalizer.com/user_daten/sections/tech_docs/archives/ldpk-2.8.tgz The file is included inside mmSolver as convenience to developers and the file hosters, at the cost of slowing down the Git fetch times for the mayaMatchMoveSolver repository. Please note that the provided archive is edited from the original to just contain the source code needed - no tests, documentation, images or pre-compiled binaries are included.
1 parent 0a83425 commit 900a8c3

File tree

4 files changed

+31
-0
lines changed

4 files changed

+31
-0
lines changed

external/archives/README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,28 @@ This directory is used to store tar/zip files for external
44
dependencies. The external build scripts use this directory as needed
55
and sometimes expect files to be added to this directory.
66

7+
## Autodesk Maya
8+
79
The following archives may be expected during building and should be
810
downloaded from [Autodesk](https://www.autodesk.com/):
911

1012
- Autodesk_Maya_2018_EN_Linux_64bit.tgz
1113
- Autodesk_Maya_2019_Linux_64bit.tgz
1214
- Autodesk_Maya_2020_ML_Linux_64bit.tgz
1315
- Autodesk_Maya_2022_ML_Linux_64bit.tgz
16+
- Autodesk_Maya_2023_ML_Linux_64bit.tgz
17+
18+
## LDPK
19+
20+
A copy of the Lens Distortion Plugin Kit (LDPK) is kept in this
21+
directory, to be used to compile the LDPK library for this project.
22+
23+
The provided archive has been edited from the original to include only
24+
the required source code for the library - all test, documentation and
25+
pre-compiled libraries are removed from the original archive.
26+
27+
- ldpk-2.8.zip
28+
29+
You can get the original copy of the LDPK from the 3DEqualizer website:
30+
https://www.3dequalizer.com/?site=tech_docs&id=110216_01
31+
https://www.3dequalizer.com/user_daten/sections/tech_docs/archives/ldpk-2.8.tgz

external/archives/ldpk-2.8.tar

486 KB
Binary file not shown.

scripts/internal/build_mmSolver_linux.bash

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ MMSCENEGRAPH_CMAKE_CONFIG_DIR="${MMSCENEGRAPH_INSTALL_DIR}/lib/cmake/mmscenegrap
9292
# We don't want to find system packages.
9393
CMAKE_IGNORE_PATH="/lib;/lib64;/usr;/usr/lib;/usr/lib64;/usr/local;/usr/local/lib;/usr/local/lib64;"
9494

95+
# A local copy of LDPK to reduce the amount of downloads to the
96+
# 3DEqualizer website (LDPK doesn't have a git repo to clone from).
97+
LDPK_URL="${PROJECT_ROOT}/external/archives/ldpk-2.8.tar"
98+
9599
# Build mmSolver project
96100
cd ${BUILD_DIR_BASE}
97101
BUILD_DIR_NAME="cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}"
@@ -120,6 +124,7 @@ ${CMAKE_EXE} \
120124
-DMMSOLVER_BUILD_TESTS=${MMSOLVER_BUILD_TESTS} \
121125
-DMAYA_LOCATION=${MAYA_LOCATION} \
122126
-DMAYA_VERSION=${MAYA_VERSION} \
127+
-Dldpk_URL=${LDPK_URL} \
123128
-Dmmscenegraph_DIR=${MMSCENEGRAPH_CMAKE_CONFIG_DIR} \
124129
${PROJECT_ROOT}
125130

scripts/internal/build_mmSolver_windows64.bat

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@ IF EXIST "C:\MinGW" (
9494
SET IGNORE_INCLUDE_DIRECTORIES="C:\MinGW\bin;C:\MinGW\include"
9595
)
9696

97+
:: A local copy of LDPK to reduce the amount of downloads to the
98+
:: 3DEqualizer website (LDPK doesn't have a git repo to clone from).
99+
SET LDPK_URL="%PROJECT_ROOT%\external\archives\ldpk-2.8.tar"
100+
:: Convert back-slashes to forward-slashes.
101+
:: https://stackoverflow.com/questions/23542453/change-backslash-to-forward-slash-in-windows-batch-file
102+
SET "LDPK_URL=%LDPK_URL:\=/%"
103+
97104
:: Optionally use "NMake Makefiles" as the build system generator.
98105
SET CMAKE_GENERATOR=Ninja
99106

@@ -128,6 +135,7 @@ CHDIR "%BUILD_DIR%"
128135
-DMMSOLVER_BUILD_TESTS=%MMSOLVER_BUILD_TESTS% ^
129136
-DMAYA_LOCATION=%MAYA_LOCATION% ^
130137
-DMAYA_VERSION=%MAYA_VERSION% ^
138+
-Dldpk_URL=%LDPK_URL% ^
131139
-Dmmscenegraph_DIR=%MMSCENEGRAPH_CMAKE_CONFIG_DIR% ^
132140
%PROJECT_ROOT%
133141
if errorlevel 1 goto failed_to_generate

0 commit comments

Comments
 (0)