diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-11-18 22:25:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 22:25:38 +0100 |
| commit | d3e18c7997c972641c5807482cea11ea1af0985a (patch) | |
| tree | a86b8fd4213c4ad0b25c16ac6bccb55bfb86a015 /tools | |
| parent | 670ca967262e6381819c5be53abcbd945ae15884 (diff) | |
| parent | a9d6fed143d395479fad6dd30c68c4a3f661626a (diff) | |
Merge pull request #10865 from fetzerch/cmake_addon_depends
[binary-addons] Rename DEPENDS_PATH to ADDON_DEPENDS_PATH
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/win32/make-addons.bat | 2 | ||||
| -rw-r--r-- | tools/windows/prepare-binary-addons-dev.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat index efad84a9cf..04ef0de25b 100644 --- a/tools/buildsteps/win32/make-addons.bat +++ b/tools/buildsteps/win32/make-addons.bat @@ -110,7 +110,7 @@ cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^ -DCMAKE_INSTALL_PREFIX=%ADDONS_INSTALL_PATH% ^ -DCORE_SOURCE_DIR=%WORKDIR% ^ -DBUILD_DIR=%ADDONS_BUILD_PATH% ^ - -DDEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ + -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ -DPACKAGE_ZIP=ON ^ -DADDONS_TO_BUILD="%ADDONS_TO_BUILD%" IF ERRORLEVEL 1 ( diff --git a/tools/windows/prepare-binary-addons-dev.bat b/tools/windows/prepare-binary-addons-dev.bat index 2e6f6f56d1..93561d430e 100644 --- a/tools/windows/prepare-binary-addons-dev.bat +++ b/tools/windows/prepare-binary-addons-dev.bat @@ -83,7 +83,7 @@ cmake "%ADDONS_PATH%" -G "Visual Studio 14" ^ -DCMAKE_INSTALL_PREFIX=%WORKDIR%\addons ^ -DCORE_SOURCE_DIR=%WORKDIR% ^ -DBUILD_DIR=%ADDONS_BUILD_PATH% ^ - -DDEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ + -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ -DPACKAGE_ZIP=ON ^ -DADDONS_TO_BUILD="%ADDONS_TO_BUILD%" IF ERRORLEVEL 1 ( |