Skip to content

Commit 4412ff9

Browse files
committed
Fix chapter 3 for PGI testing
1 parent 891050f commit 4412ff9

File tree

6 files changed

+33
-1
lines changed

6 files changed

+33
-1
lines changed

chapter-03/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-03/recipe-07/cxx-example-3.5/menu.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ circle-intel:
22
definitions:
33
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
44

5+
# Compiler errors due to some undefined alignment primitive
56
circle-pgi:
7+
skip_generators:
8+
- 'Unix Makefiles'
9+
- 'Ninja'
610
definitions:
711
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
812

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ circle-intel:
22
definitions:
33
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
44

5+
# Compiler errors due to some undefined alignment primitive
56
circle-pgi:
7+
skip_generators:
8+
- 'Unix Makefiles'
9+
- 'Ninja'
610
definitions:
711
- Eigen3_DIR: '/opt/eigen/share/eigen3/cmake'
812

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ appveyor-vs:
33
- BOOST_ROOT: 'C:\Libraries\boost_1_67_0'
44
- CMAKE_CXX_FLAGS: '-DBOOST_ALL_NO_LIB'
55

6+
# PGI and Boost do not get along
7+
circle-pgi:
8+
skip_generators:
9+
- 'Unix Makefiles'
10+
- 'Ninja'
11+
612
travis-osx:
713
definitions:
814
- BOOST_ROOT: '/usr/local/opt/boost@1.59'
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
appveyor-vs:
22
failing_generators:
33
- 'Visual Studio 15 2017 Win64'
4+
5+
# Fails to generate imported target for ZeroMQ
6+
circle-pgi:
7+
skip_generators:
8+
- 'Unix Makefiles'
9+
- 'Ninja'

chapter-03/recipe-10/c-example/FindZeroMQ.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ if(ZeroMQ_INCLUDE_DIRS)
4646
endif()
4747

4848
if(NOT ${CMAKE_C_PLATFORM_ID} STREQUAL "Windows")
49-
find_library(ZeroMQ_LIBRARIES NAMES zmq HINTS ${_ZeroMQ_ROOT}/lib)
49+
find_library(ZeroMQ_LIBRARIES
50+
NAMES
51+
zmq
52+
HINTS
53+
${_ZeroMQ_ROOT}/lib
54+
${_ZeroMQ_ROOT}/lib/x86_64-linux-gnu
55+
)
5056
else()
5157
find_library(ZeroMQ_LIBRARIES
5258
NAMES

0 commit comments

Comments
 (0)