Skip to content
This repository has been archived by the owner on Jan 22, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/ATK-3.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbrucher committed Feb 2, 2019
2 parents 82df7f5 + b10fc6b commit 8c33293
Show file tree
Hide file tree
Showing 324 changed files with 2,523 additions and 2,526 deletions.
114 changes: 1 addition & 113 deletions .appveyor.yml
@@ -1,4 +1,4 @@
version: '3.0.0.{build}'
version: '3.1.0.{build}'

shallow_clone: true

Expand All @@ -14,118 +14,6 @@ environment:
ATK_OUT: C:\projects\ATK
FFTW_ROOT: C:\projects\fftw
matrix:
#### VS 2015
### Debug build
- MY_NAME: VS 2015 Debug
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll64.zip
BITS: 64
MSVC_PLATFORM: amd64
SHORT_MSVC_PLATFORM: x64
COMPILER: Visual Studio 14 2015 Win64
OUTPUT: dynamic-x64
ADDITONAL_CMAKE_FLAGS: "-DENABLE_PYTHON=OFF"
VSINSTALL: "\\Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON_VERSION: none
BUILD_CONFIGURATION: Debug

### static runtime
- MY_NAME: VS 2015 Release Static 32
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll32.zip
BITS: 32
MSVC_PLATFORM: x86
SHORT_MSVC_PLATFORM: x86
COMPILER: Visual Studio 14 2015
OUTPUT: static-x86
ADDITONAL_CMAKE_FLAGS: "-DENABLE_PYTHON=OFF -DENABLE_SIMD=OFF -DMSVC_RUNTIME=Static -DENABLE_SHARED_LIBRARIES=OFF -DENABLE_TESTS=OFF"
VSINSTALL: "Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON_VERSION: none
BUILD_CONFIGURATION: Release

- MY_NAME: VS 2015 Release Static 64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll64.zip
BITS: 64
MSVC_PLATFORM: amd64
SHORT_MSVC_PLATFORM: x64
COMPILER: Visual Studio 14 2015 Win64
OUTPUT: static-x64
ADDITONAL_CMAKE_FLAGS: "-DENABLE_PYTHON=OFF -DMSVC_RUNTIME=Static -DENABLE_SHARED_LIBRARIES=OFF -DENABLE_TESTS=OFF"
VSINSTALL: "Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON_VERSION: none
BUILD_CONFIGURATION: Release

### shared runtime
- MY_NAME: VS 2015 Release Shared 32 Python 2
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll32.zip
BITS: 32
MSVC_PLATFORM: x86
SHORT_MSVC_PLATFORM: x86
COMPILER: Visual Studio 14 2015
OUTPUT: dynamic-x86
ADDITONAL_CMAKE_FLAGS: "-DENABLE_SIMD=OFF -DENABLE_PYTHON=ON -DDISABLE_PYTHON_TESTS=ON -DPYTHON_EXECUTABLE=C:\\Python27\\python.exe"
VSINSTALL: "Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON: C:\\Python27
PYTHON_VERSION: 2.7
BUILD_CONFIGURATION: Release

- MY_NAME: VS 2015 Release Shared 64 Python 2
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll64.zip
BITS: 64
MSVC_PLATFORM: amd64
SHORT_MSVC_PLATFORM: x64
COMPILER: Visual Studio 14 2015 Win64
OUTPUT: dynamic-x64
ADDITONAL_CMAKE_FLAGS: "-DENABLE_PYTHON=ON -DDISABLE_PYTHON_TESTS=ON -DPYTHON_EXECUTABLE=C:\\Python27-x64\\python.exe"
VSINSTALL: "\\Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON: C:\\Python27-x64
PYTHON_VERSION: 2.7
BUILD_CONFIGURATION: Release

- MY_NAME: VS 2015 Release Shared 32 Python 3
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll32.zip
BITS: 32
MSVC_PLATFORM: x86
SHORT_MSVC_PLATFORM: x86
COMPILER: Visual Studio 14 2015
OUTPUT: dynamic-x86
ADDITONAL_CMAKE_FLAGS: "-DENABLE_SIMD=OFF -DENABLE_PYTHON=ON -DDISABLE_PYTHON_TESTS=ON -DPYTHON_EXECUTABLE=C:\\Python27\\python.exe"
VSINSTALL: "Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON: C:\\Python36
PYTHON_VERSION: 3.6
BUILD_CONFIGURATION: Release

- MY_NAME: VS 2015 Release Shared 64 Python 3
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST_ROOT: C:/Libraries/boost_1_67_0
FFTW_NAME: fftw-3.3.5-dll64.zip
BITS: 64
MSVC_PLATFORM: amd64
SHORT_MSVC_PLATFORM: x64
COMPILER: Visual Studio 14 2015 Win64
OUTPUT: dynamic-x64
ADDITONAL_CMAKE_FLAGS: "-DENABLE_PYTHON=ON -DDISABLE_PYTHON_TESTS=ON -DPYTHON_EXECUTABLE=C:\\Python27-x64\\python.exe"
VSINSTALL: "\\Microsoft Visual Studio 14.0\\VC"
MSVC_VERSION: msvc-14.0
PYTHON: C:\\Python36-x64
PYTHON_VERSION: 3.6
BUILD_CONFIGURATION: Release

#### VS 2017
### Debug build
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,6 +1,3 @@
[submodule "3rdParty/libsimdpp"]
path = 3rdParty/libsimdpp
url = https://github.com/mbrucher/libsimdpp
[submodule "3rdParty/pybind11"]
path = 3rdParty/pybind11
url = https://github.com/mbrucher/pybind11
Expand Down

0 comments on commit 8c33293

Please sign in to comment.