Skip to content

Commit dd0abbc

Browse files
authored
CMake: ADIOS1 Includes w/o SYSTEM (#1076)
* CMake: ADIOS1 Includes w/o SYSTEM Our own source should not be included as `-isystem`, otherwise we can get unlucky and pick up system files with the same name (seen on Summit, where we picked up an older IOTasks.hpp for the ADIOS1 I/O handler files). * Fix includes: ADIOS1 Just IWYU clean-ness.
1 parent 049ed0b commit dd0abbc

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,9 @@ if(openPMD_HAVE_ADIOS1)
521521
target_link_libraries(openPMD.ADIOS1.Serial PUBLIC openPMD::thirdparty::mpark_variant)
522522
target_link_libraries(openPMD.ADIOS1.Parallel PUBLIC openPMD::thirdparty::mpark_variant)
523523

524-
target_include_directories(openPMD.ADIOS1.Serial SYSTEM PRIVATE
524+
target_include_directories(openPMD.ADIOS1.Serial PRIVATE
525525
${openPMD_SOURCE_DIR}/include ${openPMD_BINARY_DIR}/include)
526-
target_include_directories(openPMD.ADIOS1.Parallel SYSTEM PRIVATE
526+
target_include_directories(openPMD.ADIOS1.Parallel PRIVATE
527527
${openPMD_SOURCE_DIR}/include ${openPMD_BINARY_DIR}/include)
528528

529529
if(openPMD_HAVE_MPI)

include/openPMD/IO/IOTask.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@
2626
#include "openPMD/ChunkInfo.hpp"
2727
#include "openPMD/Dataset.hpp"
2828
#include "openPMD/IterationEncoding.hpp"
29+
#include "openPMD/Streaming.hpp"
2930

3031
#include <memory>
3132
#include <map>
3233
#include <string>
3334
#include <utility>
3435
#include <vector>
3536

36-
#include "openPMD/Streaming.hpp"
37-
3837

3938
namespace openPMD
4039
{

src/IO/ADIOS/ADIOS1IOHandler.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
# include "openPMD/auxiliary/DerefDynamicCast.hpp"
2727
# include "openPMD/auxiliary/Memory.hpp"
2828
# include "openPMD/auxiliary/StringManip.hpp"
29+
# include "openPMD/IO/AbstractIOHandlerImpl.hpp"
2930
# include "openPMD/IO/ADIOS/ADIOS1Auxiliary.hpp"
3031
# include "openPMD/IO/ADIOS/ADIOS1FilePosition.hpp"
32+
# include "openPMD/IO/IOTask.hpp"
3133
# include <adios.h>
3234
# include <iostream>
3335
# include <memory>

src/IO/ADIOS/ParallelADIOS1IOHandler.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
# include "openPMD/auxiliary/DerefDynamicCast.hpp"
2727
# include "openPMD/auxiliary/Memory.hpp"
2828
# include "openPMD/auxiliary/StringManip.hpp"
29+
# include "openPMD/IO/AbstractIOHandlerImpl.hpp"
2930
# include "openPMD/IO/ADIOS/ADIOS1Auxiliary.hpp"
3031
# include "openPMD/IO/ADIOS/ADIOS1FilePosition.hpp"
32+
# include "openPMD/IO/IOTask.hpp"
3133
# include <adios.h>
3234
# include <cstring>
3335
# include <map>

0 commit comments

Comments
 (0)