diff options
| -rw-r--r-- | .appveyor.yml | 14 | ||||
| -rw-r--r-- | .ci/Makefile (renamed from Makefile) | 4 | ||||
| -rw-r--r-- | .travis.yml | 12 |
3 files changed, 14 insertions, 16 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 4c59f4a..8ce20dc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,12 +22,10 @@ install: - choco install make build_script: - - make simple - - make static - - make dynamic + - make -f .ci/Makefile simple + - make -f .ci/Makefile static + - make -f .ci/Makefile dynamic - - make boost/58 - - - make boost/72 - - - make boost/65 + - make -f .ci/Makefile boost/58 + - make -f .ci/Makefile boost/72 + - make -f .ci/Makefile boost/65 @@ -53,8 +53,8 @@ x86_args = -A Win32 install_prefix = C:/install else makefile_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -x64_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/cmake/toolchains/gcc-x64.cmake" -x86_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/cmake/toolchains/gcc-x86.cmake" +x64_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/../cmake/toolchains/gcc-x64.cmake" +x86_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/../cmake/toolchains/gcc-x86.cmake" install_prefix := $$HOME/install endif diff --git a/.travis.yml b/.travis.yml index 8a48951..675a929 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,18 +28,18 @@ jobs: - name: Simple CMake projects script: - - make simple - - make static - - make dynamic + - make -f .ci/Makefile simple + - make -f .ci/Makefile static + - make -f .ci/Makefile dynamic - name: Boost 1.58 - script: make boost/58 + script: make -f .ci/Makefile boost/58 - name: Boost 1.72 - script: make boost/72 + script: make -f .ci/Makefile boost/72 - name: Boost 1.65 - script: make boost/65 + script: make -f .ci/Makefile boost/65 env: travis_boost_version: 1.65.0 configuration: MinSizeRel |