From 77d82b20732e02fa169c6908d13cd61b8e2caff0 Mon Sep 17 00:00:00 2001
From: Norbert Podhorszki <pnorbert@ornl.gov>
Date: Fri, 7 Apr 2017 15:57:56 -0400
Subject: [PATCH] Add adios1::adios dependency only to the MPI build for now,
but not to the NOMPI build
---
source/CMakeLists.txt | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 41db2ec29..766c5dec1 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -40,16 +40,6 @@ foreach(adios2_target IN LISTS adios2_targets)
PUBLIC ${ADIOS_SOURCE_DIR}/include
)
- if(ADIOS_USE_ADIOS1)
- find_package(ADIOS REQUIRED)
- target_sources(${adios2_target} PRIVATE
- engine/adios1/ADIOS1Reader.cpp
- engine/adios1/ADIOS1Writer.cpp
- )
- target_compile_definitions(${adios2_target} PRIVATE ADIOS_HAVE_ADIOS1)
- target_link_libraries(${adios2_target} PRIVATE adios::adios)
- endif()
-
if(ADIOS_USE_DataMan)
find_package(DataMan REQUIRED)
target_sources(${adios2_target} PRIVATE
@@ -79,6 +69,14 @@ if(ADIOS_USE_MPI)
target_include_directories(adios2 PUBLIC ${MPI_C_INCLUDE_PATH})
target_compile_definitions(adios2 PUBLIC ADIOS_HAVE_MPI)
target_link_libraries(adios2 PUBLIC ${MPI_C_LIBRARIES})
-else()
- target_sources(adios2 PRIVATE mpidummy.cpp)
+
+ if(ADIOS_USE_ADIOS1)
+ find_package(ADIOS1 REQUIRED)
+ target_sources(adios2 PRIVATE
+ engine/adios1/ADIOS1Reader.cpp
+ engine/adios1/ADIOS1Writer.cpp
+ )
+ target_compile_definitions(adios2 PRIVATE ADIOS_HAVE_ADIOS1)
+ target_link_libraries(adios2 PRIVATE adios1::adios)
+ endif()
endif()
--
GitLab