diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-01-18 14:39:19 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-01-18 14:46:35 +0300 |
| commit | 00d21c8d6d202375761f332084e01661241376a9 (patch) | |
| tree | 79c6cc2e03ecfbadee367362e7277af0444b3237 /.ci | |
| parent | README: update (diff) | |
| download | cmake-common-00d21c8d6d202375761f332084e01661241376a9.tar.gz cmake-common-00d21c8d6d202375761f332084e01661241376a9.zip | |
project.ci: --install picks the directory automatically
Diffstat (limited to '.ci')
| -rw-r--r-- | .ci/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.ci/Makefile b/.ci/Makefile index 86be651..b8e614a 100644 --- a/.ci/Makefile +++ b/.ci/Makefile @@ -58,7 +58,7 @@ python := python3 endif ifeq ($(windows),1) -install_prefix = C:/install +install_prefix := C:/install else install_prefix := $$HOME/install endif @@ -316,7 +316,9 @@ boost/65/ls: echo/boost/65/ls .PHONY: boost/65/exe/build boost/65/exe/build: echo/boost/65/exe/build - TRAVIS_BUILD_DIR="$$TRAVIS_BUILD_DIR/examples/boost" "$(python)" -m project.ci.travis.cmake --install "$(install_prefix)/boost_1_65_0" + TRAVIS_BUILD_DIR="$$TRAVIS_BUILD_DIR/examples/boost" "$(python)" -m project.ci.travis.cmake --install + +ci_install_dir := $$HOME/install endif ifdef APPVEYOR .PHONY: boost/65/build @@ -329,20 +331,22 @@ boost/65/ls: echo/boost/65/ls .PHONY: boost/65/exe/build boost/65/exe/build: echo/boost/65/exe/build - set "APPVEYOR_BUILD_FOLDER=%APPVEYOR_BUILD_FOLDER%\examples\boost" && "$(python)" -m project.ci.appveyor.cmake --install "$(install_prefix)/boost_1_65_0" + set "APPVEYOR_BUILD_FOLDER=%APPVEYOR_BUILD_FOLDER%\examples\boost" && "$(python)" -m project.ci.appveyor.cmake --install + +ci_install_dir := C:/projects/install endif .PHONY: boost/65/exe/run boost/65/exe/run: echo/boost/65/exe/run - "$(install_prefix)/boost_1_65_0/bin/foo" + "$(ci_install_dir)/bin/foo" .PHONY: boost/65/exe/arch boost/65/exe/arch: echo/boost/65/exe/arch - $(verify_arch) "$(install_prefix)/boost_1_65_0/bin/foo$(exe_ext)" x64 + $(verify_arch) "$(ci_install_dir)/bin/foo$(exe_ext)" x64 .PHONY: boost/65/exe/symbols boost/65/exe/symbols: echo/boost/65/exe/symbols - $(verify_symbols) "$(install_prefix)/boost_1_65_0/bin/foo$(exe_ext)" + $(verify_symbols) "$(ci_install_dir)/bin/foo$(exe_ext)" .PHONY: boost/65/exe boost/65/exe: boost/65/exe/build boost/65/exe/run boost/65/exe/arch boost/65/exe/symbols |