Skip to content

Commit

Permalink
Merge pull request #498 from robertodr/almost-conda-pinning
Browse files Browse the repository at this point in the history 
Almost conda pinning
  • Loading branch information
@robertodr
robertodr authored Sep 21, 2018
2 parents d6ef39b + 603306a commit 275747f
Show file tree
Hide file tree
Showing 54 changed files with 141 additions and 96 deletions.
52 changes: 15 additions & 37 deletions .appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,26 @@ build:
cache:
- c:\tools\vcpkg\installed\ -> testing\dependencies\appveyor\install.bat
- c:\msys64\var\cache\pacman\pkg -> testing\dependencies\appveyor\install.bat
- c:\Deps\boost_1_67_0 -> testing\dependencies\appveyor\boost.bat
- c:\Deps\conda\ -> testing\dependencies\appveyor\anaconda.ps1
- c:\Deps\boost_1_67_0 -> testing\dependencies\appveyor\boost.bat

image:
- Previous Visual Studio 2017
- Visual Studio 2017

environment:
# Create expected SHELL variable for pipenv.
SHELL: "windows"
CTEST_OUTPUT_ON_FAILURE: "1"
SHELL: 'windows'
CTEST_OUTPUT_ON_FAILURE: '1'
matrix:
- CMAKE_GENERATOR: "MSYS Makefiles"
BUILDFLAGS: "VERBOSE=1"
CMAKEARGS: ""
- CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
BUILDFLAGS: "/verbosity:normal"
CMAKEARGS: ""
- CMAKE_GENERATOR: "Ninja"
BUILDFLAGS: "-v"
CMAKEARGS: ""
- CMAKE_GENERATOR: "MSYS Makefiles"
ANACONDA_TESTS_ONLY: "1"
BUILDFLAGS: "VERBOSE=1"
CMAKEARGS: ""
- CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
ANACONDA_TESTS_ONLY: "1"
BUILDFLAGS: "/verbosity:normal"
CMAKEARGS: ""
- CMAKE_GENERATOR: 'MSYS Makefiles'
BUILDFLAGS: 'VERBOSE=1'
- CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64'
BUILDFLAGS: '/verbosity:normal'
- CMAKE_GENERATOR: 'Ninja'
BUILDFLAGS: '-v'
- CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64'
BUILDFLAGS: '/verbosity:normal'
ANACONDA_TESTS_ONLY: '1'

matrix:
fast_finish: true
Expand Down Expand Up @@ -72,23 +64,9 @@ build_script:
- bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv lock"
- bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv install"
- if "%ANACONDA_TESTS_ONLY%"=="1" (
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-04'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-05'"
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-04'"
) else (
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-01/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-02/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-03/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-04/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-05/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-06/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-07/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-08/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-09/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-10/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-12/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'"
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-01/recipe-*'"
)

deploy: off
17 changes: 17 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Change Log

## [Unreleased]

## [Version 1.0] - 2018-09-XY

### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security

[Unreleased]: https://github.com/dev-cafe/cmake-cookbook/compare/v1.0...HEAD
[Version 1.0]: https://github.com/dev-cafe/cmake-cookbook/releases/tag/v1.0

[GitHub]: https://github.com/dev-cafe/cmake-cookbook
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ published by Packt and authored by [Radovan Bast](https://github.com/bast) and
- [1. Installing your project](chapter-10/recipe-01/README.md)
- [2. Generating export headers](chapter-10/recipe-02/README.md)
- [3. Exporting your targets](chapter-10/recipe-03/README.md)
- [4. Installing a superbuild project](chapter-10/recipe-04/README.md)
- [4. Installing a superbuild](chapter-10/recipe-04/README.md)


### [Chapter 11: Packaging Projects](chapter-11/README.md)
Expand Down
2 changes: 1 addition & 1 deletion chapter-01/recipe-01/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-01/recipe-02/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-01/recipe-03/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-01/recipe-09/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-02/recipe-03/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
4 changes: 2 additions & 2 deletions chapter-02/recipe-06/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ circle-intel:
circle-pgi:
definitions:
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'

travis-linux:
definitions:
- Eigen3_DIR: '$HOME/Deps/eigen/share/eigen3/cmake'

# OpenMP does not work with clang
travis-osx:
failing_generators:
skip_generators:
- 'Unix Makefiles'
- 'Ninja'

Expand Down
1 change: 1 addition & 0 deletions chapter-03/recipe-04/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# No suitable native BLAS/LAPACK with MSVC
appveyor-vs:
failing_generators:
- 'Visual Studio 15 2017 Win64'
Expand Down
2 changes: 1 addition & 1 deletion chapter-03/recipe-05/cxx-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OpenMP does not work with clang
travis-osx:
failing_generators:
skip_generators:
- 'Unix Makefiles'
- 'Ninja'
2 changes: 1 addition & 1 deletion chapter-03/recipe-05/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OpenMP does not work with clang
travis-osx:
failing_generators:
skip_generators:
- 'Unix Makefiles'
- 'Ninja'
2 changes: 1 addition & 1 deletion chapter-03/recipe-05/fortran-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-03/recipe-05/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
3 changes: 2 additions & 1 deletion chapter-03/recipe-06/c-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ appveyor-vs:
- MSMPI_INC: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Include\'
- MSMPI_LIB32: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x86\'
- MSMPI_LIB64: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x64\'


# No suitable MPI with MSYS
appveyor-msys:
failing_generators:
- 'MSYS Makefiles'
Expand Down
1 change: 1 addition & 0 deletions chapter-03/recipe-06/c-example/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ appveyor-vs:
- MSMPI_LIB32: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x86\'
- MSMPI_LIB64: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x64\'

# No suitable MPI with MSYS
appveyor-msys:
failing_generators:
- 'MSYS Makefiles'
Expand Down
1 change: 1 addition & 0 deletions chapter-03/recipe-06/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ appveyor-vs:
- MSMPI_LIB32: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x86\'
- MSMPI_LIB64: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x64\'

# No suitable MPI with MSYS
appveyor-msys:
failing_generators:
- 'MSYS Makefiles'
Expand Down
2 changes: 1 addition & 1 deletion chapter-03/recipe-07/cxx-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ travis-linux:

# OpenMP does not work with clang
travis-osx:
failing_generators:
skip_generators:
- 'Unix Makefiles'
- 'Ninja'

Expand Down
2 changes: 1 addition & 1 deletion chapter-03/recipe-07/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ travis-linux:

# OpenMP does not work with clang
travis-osx:
failing_generators:
skip_generators:
- 'Unix Makefiles'
- 'Ninja'

Expand Down
3 changes: 2 additions & 1 deletion chapter-03/recipe-09/c-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# No pkg-config with Visual Studio generator
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'
3 changes: 2 additions & 1 deletion chapter-03/recipe-09/c-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# No pkg-config with Visual Studio generator
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

# Fails to generate imported target for ZeroMQ
Expand Down
4 changes: 2 additions & 2 deletions chapter-05/recipe-03/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appveyor-vs:
failing_generators:
- 'Visual Studio 15 2017 Win64'
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
failing_generators:
Expand Down
4 changes: 2 additions & 2 deletions chapter-05/recipe-04/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appveyor-vs:
failing_generators:
- 'Visual Studio 15 2017 Win64'
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
failing_generators:
Expand Down
2 changes: 1 addition & 1 deletion chapter-05/recipe-05/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
4 changes: 3 additions & 1 deletion chapter-05/recipe-08/c-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# No pkg-config with Visual Studio generator
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

# UUID can't be found on MSYS
appveyor-msys:
failing_generators:
- 'MSYS Makefiles'
Expand Down
4 changes: 3 additions & 1 deletion chapter-05/recipe-08/c-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# No pkg-config with Visual Studio generator
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

# UUID can't be found on MSYS
appveyor-msys:
failing_generators:
- 'MSYS Makefiles'
Expand Down
3 changes: 2 additions & 1 deletion chapter-05/recipe-09/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ appveyor-vs:
- MSMPI_LIB32: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x86\'
- MSMPI_LIB64: 'C:\Program Files (x86)\Microsoft SDKs\MPI\Lib\x64\'

# No suitable MPI with MSYS
appveyor-msys:
failing_generators:
skip_generators:
- 'MSYS Makefiles'
- 'Ninja'
2 changes: 1 addition & 1 deletion chapter-06/recipe-01/fortran-c-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-06/recipe-02/fortran-c-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-06/recipe-04/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
6 changes: 5 additions & 1 deletion chapter-07/recipe-09/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand All @@ -12,3 +12,7 @@ targets:
travis-linux:
failing_generators:
- 'Ninja'

travis-osx:
failing_generators:
- 'Ninja'
2 changes: 1 addition & 1 deletion chapter-09/recipe-01/fortran-c-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-09/recipe-01/fortran-cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-09/recipe-01/fortran-uuid-example-3.5/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-09/recipe-01/fortran-uuid-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-09/recipe-02/cxx-example/menu.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-09/recipe-06/fortran-example/menu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ targets:
- test

appveyor-vs:
failing_generators:
skip_generators:
- 'Visual Studio 15 2017 Win64'

appveyor-msys:
Expand Down
2 changes: 1 addition & 1 deletion chapter-10/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
- [1. Installing your project](recipe-01/README.md)
- [2. Generating export headers](recipe-02/README.md)
- [3. Exporting your targets](recipe-03/README.md)
- [4. Installing a superbuild project](recipe-04/README.md)
- [4. Installing a superbuild](recipe-04/README.md)
2 changes: 1 addition & 1 deletion chapter-10/recipe-04/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Installing a superbuild project
# Installing a superbuild

This recipe shows how to install a superbuild which depends on a library which
may or may not be available on the system.
Expand Down
2 changes: 1 addition & 1 deletion chapter-10/recipe-04/title.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Installing a superbuild project
Installing a superbuild
Loading

0 comments on commit 275747f

Please sign in to comment.