Skip to content

Commit 7393727

Browse files
committed
Fix for the PDA cmake and QC cmake
1 parent ef8145c commit 7393727

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

cmake/FindPDA.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ find_package(PkgConfig)
1111

1212
# find includes
1313
find_path(PDA_INCLUDE_DIR pda.h
14-
HINTS ${PDA_ROOT} /usr/local/include /usr/include PATH_SUFFIXES "pda")
15-
14+
HINTS ${PDA_ROOT} ${PDA_ROOT}/include /usr/local/include /usr/include)
1615
# find libraries
17-
find_library(PDA_LIBRARY NAMES pda HINTS /usr/local/lib /usr/lib ${PDA_ROOT})
16+
find_library(PDA_LIBRARY NAMES pda HINTS ${PDA_ROOT} ${PDA_ROOT}/lib /usr/local/lib /usr/lib )
1817

1918
set(PDA_LIBRARIES ${PDA_LIBRARY})
2019
set(PDA_INCLUDE_DIRS ${PDA_INCLUDE_DIR})

cmake/ReadoutCardDependencies.cmake

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ if(PDA_FOUND)
3030
# Add definition to enable the PDA implementation in the code
3131
set(ALICEO2_READOUTCARD_PDA_ENABLED TRUE)
3232
add_definitions(-DALICEO2_READOUTCARD_PDA_ENABLED)
33-
include_directories(SYSTEM ${PDA_INCLUDE_DIRS})
3433
else()
3534
message(WARNING "PDA not found, ReadoutCard module will have a dummy implementation only (skip, no error)")
3635
endif(PDA_FOUND)
@@ -39,7 +38,6 @@ endif(PDA_FOUND)
3938
find_package(DIM)
4039
if(DIM_FOUND)
4140
message(STATUS "DIM found")
42-
include_directories(${DIM_INCLUDE_DIRS})
4341
else()
4442
message(WARNING "DIM not found, ReadoutCard module's ALF utilities will not be compiled")
4543
endif(DIM_FOUND)
@@ -72,6 +70,7 @@ o2_define_bucket(
7270

7371
SYSTEMINCLUDE_DIRECTORIES
7472
${Boost_INCLUDE_DIR}
73+
${PDA_INCLUDE_DIRS}
7574
)
7675

7776
o2_define_bucket(
@@ -81,7 +80,8 @@ o2_define_bucket(
8180
DEPENDENCIES
8281
${DIM_LIBRARY}
8382

84-
INCLUDE_DIRECTORIES
83+
SYSTEMINCLUDE_DIRECTORIES
84+
${DIM_INCLUDE_DIRS}
8585
)
8686

8787
o2_define_bucket(
@@ -104,8 +104,4 @@ o2_define_bucket(
104104
o2_readoutcard_bucket
105105
o2_readoutcard_pda
106106
o2_readoutcard_python
107-
${PDA_LIBRARIES}
108-
109-
SYSTEMINCLUDE_DIRECTORIES
110-
${Boost_INCLUDE_DIR}
111107
)

0 commit comments

Comments
 (0)