diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-30 12:54:03 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-04-05 20:46:58 +0300 |
| commit | 842779a131ac4bda3c1386f3c50bce4c39134dcc (patch) | |
| tree | 9d45705219ddd6da7634e1535804ad21a73d7e17 | |
| parent | add some unit tests (diff) | |
| download | winapi-debug-842779a131ac4bda3c1386f3c50bce4c39134dcc.tar.gz winapi-debug-842779a131ac4bda3c1386f3c50bce4c39134dcc.zip | |
update cmake-common
| -rw-r--r-- | .appveyor.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | .travis/Dockerfile | 17 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | cmake | 0 |
5 files changed, 13 insertions, 16 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 15b26de..788d0a3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,11 +25,11 @@ install: build_script: - '"%python_exe%" cmake\tools\clang-format.py' + - cd cmake - >- - "%python_exe%" cmake\cmake\build\ci\appveyor.py + "%python_exe%" -m project.ci.appveyor.cmake --install "%install_dir%" - -- - -D "BOOST_ROOT=%appveyor_boost_root%" + --boost "%appveyor_boost_root%" after_build: - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%" diff --git a/.travis.yml b/.travis.yml index ef59e4c..ba09998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ services: env: global: - travis_boost_version: 1.65.0 + boost_version: 1.65.0 jobs: - configuration=Debug platform=x86 - configuration=Release platform=x86 @@ -20,7 +20,7 @@ env: script: >- docker-compose -f .travis/docker-compose.yml build - --build-arg travis_boost_version="$travis_boost_version" + --build-arg boost_version="$boost_version" --build-arg platform="$platform" --build-arg configuration="$configuration" mingw_build diff --git a/.travis/Dockerfile b/.travis/Dockerfile index d17d54f..28f1ab5 100644 --- a/.travis/Dockerfile +++ b/.travis/Dockerfile @@ -15,33 +15,30 @@ RUN apt-get update -yq && \ make \ mingw-w64 -ARG travis_boost_version=1.65.0 +ARG boost_version=1.65.0 ARG platform=x86 ARG configuration=Debug # We're on Travis, that's right. -ENV TRAVIS=1 ENV TRAVIS_BUILD_DIR=/usr/src COPY ["cmake", "$TRAVIS_BUILD_DIR/cmake"] WORKDIR "$TRAVIS_BUILD_DIR" -RUN ./cmake/boost/build/ci/travis.py \ - --link static \ +RUN cd cmake && \ + python3 -m project.ci.travis.boost \ + --mingw \ -- \ - --user-config="$TRAVIS_BUILD_DIR/cmake/boost/toolchains/mingw-w64-$platform.jam" \ --with-filesystem \ --with-program_options \ --with-test COPY [".", "$TRAVIS_BUILD_DIR"] -RUN ./cmake/cmake/build/ci/travis.py \ +RUN cd cmake && \ + python3 -m project.ci.travis.cmake \ --install /opt/pdb-repo \ - -- \ - -D "CMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/cmake/toolchains/mingw-w64-$platform.cmake" \ - -D "BOOST_ROOT=$HOME/boost" \ - -D "BOOST_LIBRARYDIR=$HOME/boost/stage/$platform/$configuration/lib" + --mingw FROM base diff --git a/CMakeLists.txt b/CMakeLists.txt index c5296e9..3015fb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets project(pdb_repo CXX) -include(cmake/cmake/common.cmake) +include(cmake/common.cmake) find_package(Boost REQUIRED) add_subdirectory(3rdparty/boost/nowide) diff --git a/cmake b/cmake -Subproject 87ec5baa9392c8f3a1f9777453a12a8055d146b +Subproject 0f474b66fe1d6cfdb286deb1ef19e2b37e60d4e |