Skip to content

Commit 68ed918

Browse files
committed
Fix chapter 1 for PGI
1 parent 72c47fc commit 68ed918

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

chapter-01/recipe-08/cxx-example/menu.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ appveyor-msys:
66
definitions:
77
- CMAKE_CXX_FLAGS: '-fno-exceptions -fno-rtti'
88

9-
drone:
9+
circle-intel:
1010
definitions:
1111
- CMAKE_CXX_FLAGS: '-fno-exceptions -fno-rtti'
1212

13+
# PGI does not understand -Wall -Wextra -Wpedantic
14+
circle-pgi:
15+
skip_generators:
16+
- 'Unix Makefiles'
17+
- 'Ninja'
18+
1319
travis-linux:
1420
definitions:
1521
- CMAKE_CXX_FLAGS: '-fno-exceptions -fno-rtti'

chapter-01/recipe-09/fortran-example/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ add_library(
1616
add_executable(compute-areas compute-areas.f90)
1717

1818
# These compiler flags will not work on Windows
19+
# Intel or PGI
1920
target_compile_options(geometry
2021
PRIVATE
2122
"-std=f2008"

chapter-01/recipe-09/fortran-example/menu.yml

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

9-
drone:
10-
definitions:
11-
- CMAKE_Fortran_COMPILER: 'gfortran'
12-
failing_generators:
9+
# Intel use -std08 instead of -std=f2008
10+
circle-intel:
11+
skip_generators:
12+
- 'Unix Makefiles'
13+
- 'Ninja'
14+
15+
# PGI seems not to support Fortran2008 yet
16+
circle-pgi:
17+
skip_generators:
18+
- 'Unix Makefiles'
1319
- 'Ninja'
1420

1521
travis-linux:

0 commit comments

Comments
 (0)