Skip to content

Commit 089d40b

Browse files
committed
Fix chapter 5 for PGI testing [skip appveyor]
1 parent ff0ef6e commit 089d40b

File tree

6 files changed

+27
-2
lines changed

6 files changed

+27
-2
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Compiler errors due to some undefined alignment primitive
2+
circle-pgi:
3+
skip_generators:
4+
- 'Unix Makefiles'
5+
- 'Ninja'

chapter-05/recipe-03/cxx-example/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22

3-
project(recipe-03 LANGUAGES CXX)
3+
# Fortran needed to discover LAPACK with some compilers
4+
project(recipe-03 LANGUAGES CXX Fortran)
45

56
set(CMAKE_CXX_STANDARD 11)
67
set(CMAKE_CXX_EXTENSIONS OFF)

chapter-05/recipe-03/cxx-example/menu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ appveyor-msys:
66
failing_generators:
77
- 'Ninja'
88

9+
# Need to link against libpgftnrtl and librt
10+
circle-pgi:
11+
skip_generators:
12+
- 'Unix Makefiles'
13+
- 'Ninja'
14+
915
travis-linux:
1016
failing_generators:
1117
- 'Ninja'

chapter-05/recipe-04/cxx-example/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22

3-
project(recipe-04 LANGUAGES CXX)
3+
# Fortran needed to discover LAPACK with some compilers
4+
project(recipe-04 LANGUAGES CXX Fortran)
45

56
set(CMAKE_CXX_STANDARD 11)
67
set(CMAKE_CXX_EXTENSIONS OFF)

chapter-05/recipe-04/cxx-example/menu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ appveyor-msys:
66
failing_generators:
77
- 'Ninja'
88

9+
# Need to link against libpgftnrtl and librt
10+
circle-pgi:
11+
skip_generators:
12+
- 'Unix Makefiles'
13+
- 'Ninja'
14+
915
travis-linux:
1016
failing_generators:
1117
- 'Ninja'

chapter-05/recipe-09/cxx-example-asan/menu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,9 @@ appveyor-vs:
22
definitions:
33
- CMAKE_BUILD_TYPE: 'Release'
44
- CMAKE_CONFIGURATION_TYPES: 'Release'
5+
6+
# PGI does not understand all compiler options needed
7+
circle-pgi:
8+
skip_generators:
9+
- 'Unix Makefiles'
10+
- 'Ninja'

0 commit comments

Comments
 (0)