diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-15 13:25:33 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-15 13:34:11 +0300 |
| commit | 35968382a636d5365ee8b03fd101e4ac414f4dc3 (patch) | |
| tree | 8854d3ea849c8232212ea2654a693864fe94e6cb | |
| parent | AppVeyor/Travis: switch to cmake/build (diff) | |
| download | aes-tools-35968382a636d5365ee8b03fd101e4ac414f4dc3.tar.gz aes-tools-35968382a636d5365ee8b03fd101e4ac414f4dc3.zip | |
update cmake-common
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| m--------- | cmake | 0 |
3 files changed, 14 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 657cbbf..fe372b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,19 +19,21 @@ env: before_script: - |- - ./cmake/build/boost/build_travis.sh \ - target-os=windows \ + ./cmake/ci/boost/build_travis.py \ + -- \ + link=static \ + target-os=windows \ --user-config="$TRAVIS_BUILD_DIR/cmake/toolchains/boost/mingw-w64-$platform.jam" \ - --with-filesystem \ - --with-program_options \ + --with-filesystem \ + --with-program_options \ --with-system script: - |- - ./cmake/build/build_travis.py \ - --configuration "$configuration" \ - --install "$HOME/install" \ - --boost "$HOME/boost_1_71_0" \ - --toolchain "./cmake/toolchains/mingw-w64-$platform.cmake" \ - --boost-librarydir "$HOME/boost_1_71_0/stage/$platform/${configuration,,}/lib" \ - -- -DCMAKE_SYSTEM_NAME=Windows + ./cmake/ci/build_travis.py \ + --install "$HOME/install" \ + -- \ + -D "BOOST_ROOT=$HOME/boost_1_71_0" \ + -D "BOOST_LIBRARYDIR=$HOME/boost_1_71_0/stage/$platform/$configuration/lib" \ + -D "CMAKE_TOOLCHAIN_FILE=cmake/toolchains/mingw-w64-$platform.cmake" \ + -D CMAKE_SYSTEM_NAME=Windows diff --git a/appveyor.yml b/appveyor.yml index dd492b9..deed872 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ install: - git submodule update --init --recursive build_script: - - '"%python_exe%" cmake\build\build_appveyor.py --install "%install_dir%" --boost "%appveyor_boost_root%" --boost-librarydir "%appveyor_boost_librarydir%" -- "-DAES_TOOLS_ASM=%use_asm%"' + - '"%python_exe%" cmake\ci\build_appveyor.py --install "%install_dir%" -- -D "BOOST_ROOT=%appveyor_boost_root%" -D "BOOST_LIBRARYDIR=%appveyor_boost_librarydir%" -D "AES_TOOLS_ASM=%use_asm%"' test_script: - '"%python_exe%" "%APPVEYOR_BUILD_FOLDER%\\test\\nist.py" --path "%install_dir%\bin" --log "%APPVEYOR_BUILD_FOLDER%\test\nist.log"' diff --git a/cmake b/cmake -Subproject 77571d71ce48a68cbd6d3a931b89d07e298f3f3 +Subproject e3c81aeff2eae97259df94bc066296432a95ef2 |