From ab17c2ee414108950909cbd5c49344d4394bc520 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 18 Apr 2017 21:40:35 -0400
Subject: [PATCH] Added install rules for the adios2 target
---
source/CMakeLists.txt | 15 +++++++++++----
thirdparty/KWSys/CMakeLists.txt | 4 ++++
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index b9481731c..e138a98cd 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -120,12 +120,19 @@ install(
RENAME adios2.h
)
install(
- FILES
- ADIOS.h ADIOSMacros.h ADIOS_MPI.h ADIOSTypes.h mpidummy.h
+ FILES ADIOS.h ADIOS.inl ADIOSMacros.h ADIOS_MPI.h ADIOSTypes.h mpidummy.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2
)
install(
- DIRECTORY core
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/core
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2
- FILES_MATCHING PATTERN "*.h" PATTERN "*.inl"
+ FILES_MATCHING REGEX "[^/]*\.(h|inl)$"
+)
+
+# Library installation
+install(
+ TARGETS adios2 EXPORT adios2
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
diff --git a/thirdparty/KWSys/CMakeLists.txt b/thirdparty/KWSys/CMakeLists.txt
index 058c8f9ef..15166f82a 100644
--- a/thirdparty/KWSys/CMakeLists.txt
+++ b/thirdparty/KWSys/CMakeLists.txt
@@ -1,5 +1,9 @@
set(KWSYS_NAMESPACE adios2sys)
set(KWSYS_USE_DynamicLoader ON)
set(KWSYS_BUILD_SHARED OFF)
+if(NOT ADIOS_BUILD_SHARED_LIBS)
+ set(KWSYS_INSTALL_EXPORT_NAME adios2)
+ set(KWSYS_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
+endif()
add_subdirectory(adios2sys)
--
GitLab