Merge pull request #498 from robertodr/almost-conda-pinning

robertodr · web-flow · commit 275747f7fbd3 · 2018-09-21T16:22:47.000-04:00
Almost conda pinning
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -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
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
diff --git a/README.md b/README.md
@@ -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)
diff --git a/chapter-01/recipe-01/fortran-example/menu.yml b/chapter-01/recipe-01/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-01/recipe-02/fortran-example/menu.yml b/chapter-01/recipe-02/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-01/recipe-03/fortran-example/menu.yml b/chapter-01/recipe-03/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-01/recipe-09/fortran-example/menu.yml b/chapter-01/recipe-09/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-02/recipe-03/fortran-example/menu.yml b/chapter-02/recipe-03/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-02/recipe-06/cxx-example/menu.yml b/chapter-02/recipe-06/cxx-example/menu.yml
@@ -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'
 
diff --git a/chapter-03/recipe-04/cxx-example/menu.yml b/chapter-03/recipe-04/cxx-example/menu.yml
@@ -1,3 +1,4 @@
+# No suitable native BLAS/LAPACK with MSVC
 appveyor-vs:
   failing_generators:
     - 'Visual Studio 15 2017 Win64'
diff --git a/chapter-03/recipe-05/cxx-example-3.5/menu.yml b/chapter-03/recipe-05/cxx-example-3.5/menu.yml
@@ -1,5 +1,5 @@
 # OpenMP does not work with clang
 travis-osx:
-  failing_generators:
+  skip_generators:
     - 'Unix Makefiles'
     - 'Ninja'
diff --git a/chapter-03/recipe-05/cxx-example/menu.yml b/chapter-03/recipe-05/cxx-example/menu.yml
@@ -1,5 +1,5 @@
 # OpenMP does not work with clang
 travis-osx:
-  failing_generators:
+  skip_generators:
     - 'Unix Makefiles'
     - 'Ninja'
diff --git a/chapter-03/recipe-05/fortran-example-3.5/menu.yml b/chapter-03/recipe-05/fortran-example-3.5/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-03/recipe-05/fortran-example/menu.yml b/chapter-03/recipe-05/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-03/recipe-06/c-example-3.5/menu.yml b/chapter-03/recipe-06/c-example-3.5/menu.yml
@@ -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'
diff --git a/chapter-03/recipe-06/c-example/menu.yml b/chapter-03/recipe-06/c-example/menu.yml
@@ -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'
diff --git a/chapter-03/recipe-06/cxx-example/menu.yml b/chapter-03/recipe-06/cxx-example/menu.yml
@@ -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'
diff --git a/chapter-03/recipe-07/cxx-example-3.5/menu.yml b/chapter-03/recipe-07/cxx-example-3.5/menu.yml
@@ -16,7 +16,7 @@ travis-linux:
 
 # OpenMP does not work with clang
 travis-osx:
-  failing_generators:
+  skip_generators:
     - 'Unix Makefiles'
     - 'Ninja'
 
diff --git a/chapter-03/recipe-07/cxx-example/menu.yml b/chapter-03/recipe-07/cxx-example/menu.yml
@@ -16,7 +16,7 @@ travis-linux:
 
 # OpenMP does not work with clang
 travis-osx:
-  failing_generators:
+  skip_generators:
     - 'Unix Makefiles'
     - 'Ninja'
 
diff --git a/chapter-03/recipe-09/c-example-3.5/menu.yml b/chapter-03/recipe-09/c-example-3.5/menu.yml
@@ -1,3 +1,4 @@
+# No pkg-config with Visual Studio generator
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
diff --git a/chapter-03/recipe-09/c-example/menu.yml b/chapter-03/recipe-09/c-example/menu.yml
@@ -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
diff --git a/chapter-05/recipe-03/cxx-example/menu.yml b/chapter-05/recipe-03/cxx-example/menu.yml
@@ -1,6 +1,6 @@
 appveyor-vs:
-  failing_generators:
-    - 'Visual Studio 15 2017 Win64' 
+  skip_generators:
+    - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
   failing_generators:
diff --git a/chapter-05/recipe-04/cxx-example/menu.yml b/chapter-05/recipe-04/cxx-example/menu.yml
@@ -1,6 +1,6 @@
 appveyor-vs:
-  failing_generators:
-    - 'Visual Studio 15 2017 Win64' 
+  skip_generators:
+    - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
   failing_generators:
diff --git a/chapter-05/recipe-05/fortran-example/menu.yml b/chapter-05/recipe-05/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-05/recipe-08/c-example-3.5/menu.yml b/chapter-05/recipe-08/c-example-3.5/menu.yml
@@ -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'
diff --git a/chapter-05/recipe-08/c-example/menu.yml b/chapter-05/recipe-08/c-example/menu.yml
@@ -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'
diff --git a/chapter-05/recipe-09/cxx-example/menu.yml b/chapter-05/recipe-09/cxx-example/menu.yml
@@ -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'
diff --git a/chapter-06/recipe-01/fortran-c-example/menu.yml b/chapter-06/recipe-01/fortran-c-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-06/recipe-02/fortran-c-example/menu.yml b/chapter-06/recipe-02/fortran-c-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-06/recipe-04/fortran-example/menu.yml b/chapter-06/recipe-04/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-07/recipe-09/fortran-example/menu.yml b/chapter-07/recipe-09/fortran-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
@@ -12,3 +12,7 @@ targets:
 travis-linux:
   failing_generators:
     - 'Ninja'
+
+travis-osx:
+  failing_generators:
+    - 'Ninja'
diff --git a/chapter-09/recipe-01/fortran-c-example/menu.yml b/chapter-09/recipe-01/fortran-c-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-09/recipe-01/fortran-cxx-example/menu.yml b/chapter-09/recipe-01/fortran-cxx-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-09/recipe-01/fortran-uuid-example-3.5/menu.yml b/chapter-09/recipe-01/fortran-uuid-example-3.5/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-09/recipe-01/fortran-uuid-example/menu.yml b/chapter-09/recipe-01/fortran-uuid-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-09/recipe-02/cxx-example/menu.yml b/chapter-09/recipe-02/cxx-example/menu.yml
@@ -1,5 +1,5 @@
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-09/recipe-06/fortran-example/menu.yml b/chapter-09/recipe-06/fortran-example/menu.yml
@@ -2,7 +2,7 @@ targets:
   - test
 
 appveyor-vs:
-  failing_generators:
+  skip_generators:
     - 'Visual Studio 15 2017 Win64'
 
 appveyor-msys:
diff --git a/chapter-10/README.md b/chapter-10/README.md
@@ -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)
diff --git a/chapter-10/recipe-04/README.md b/chapter-10/recipe-04/README.md
@@ -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.
diff --git a/chapter-10/recipe-04/title.txt b/chapter-10/recipe-04/title.txt
@@ -1 +1 @@
-Installing a superbuild project
+Installing a superbuild
diff --git a/chapter-11/recipe-03/fortran-example/menu.yml b/chapter-11/recipe-03/fortran-example/menu.yml
diff --git a/chapter-11/recipe-04/cxx-example/custom.sh b/chapter-11/recipe-04/cxx-example/custom.sh
diff --git a/chapter-11/recipe-04/cxx-example/menu.yml b/chapter-11/recipe-04/cxx-example/menu.yml
diff --git a/chapter-11/recipe-05/cxx-example/conda-recipe/meta.yaml b/chapter-11/recipe-05/cxx-example/conda-recipe/meta.yaml
diff --git a/chapter-11/recipe-05/cxx-example/custom.sh b/chapter-11/recipe-05/cxx-example/custom.sh
diff --git a/chapter-11/recipe-05/cxx-example/menu.yml b/chapter-11/recipe-05/cxx-example/menu.yml
diff --git a/chapter-13/recipe-02/fortran-example/menu.yml b/chapter-13/recipe-02/fortran-example/menu.yml
diff --git a/chapter-14/recipe-03/fortran-example/menu.yml b/chapter-14/recipe-03/fortran-example/menu.yml
diff --git a/chapter-14/recipe-04/cxx-example/menu.yml b/chapter-14/recipe-04/cxx-example/menu.yml
diff --git a/contributing/README.md b/contributing/README.md
diff --git a/testing/README.md b/testing/README.md
diff --git a/testing/collect_tests.py b/testing/collect_tests.py
diff --git a/testing/dependencies/appveyor/anaconda.ps1 b/testing/dependencies/appveyor/anaconda.ps1
diff --git a/testing/dependencies/travis/anaconda.sh b/testing/dependencies/travis/anaconda.sh

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# No suitable native BLAS/LAPACK with MSVC`
`1`	`2`	`appveyor-vs:`
`2`	`3`	`failing_generators:`
`3`	`4`	`- 'Visual Studio 15 2017 Win64'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Installing a superbuild project`
	`1`	`+# Installing a superbuild`
`2`	`2`
`3`	`3`	`This recipe shows how to install a superbuild which depends on a library which`
`4`	`4`	`may or may not be available on the system.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Installing a superbuild project`
	`1`	`+Installing a superbuild`