From 328802eafac7d661e5bbff00b6cb4e4821c5eb27 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Thu, 29 Jun 2017 11:15:36 -0400
Subject: [PATCH] Use consistent output directories
---
CMakeLists.txt | 6 ++++--
bindings/python/CMakeLists.txt | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b31022160..277693443 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,10 @@ project(ADIOS2 VERSION 2.0.0)
#------------------------------------------------------------------------------#
# Some boilerplate to setup nice output directories
#------------------------------------------------------------------------------#
-include(GNUInstallDirs)
-set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/adios2")
+set(CMAKE_INSTALL_BINDIR bin)
+set(CMAKE_INSTALL_LIBDIR lib)
+set(CMAKE_INSTALL_INCLUDEDIR include)
+set(CMAKE_INSTALL_CMAKEDIR lib/cmake/adios2)
list(INSERT CMAKE_MODULE_PATH 0 "${ADIOS2_SOURCE_DIR}/cmake")
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 1f0604287..8403e7306 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -27,7 +27,8 @@ if(ADIOS2_HAVE_MPI)
target_link_libraries(adios2py PRIVATE PythonModule::mpi4py)
endif()
-string(REGEX REPLACE "^${PYTHON_PREFIX}/" ""
+string(REGEX REPLACE
+ "^${PYTHON_PREFIX}/[^/]*/python" "${CMAKE_INSTALL_LIBDIR}/python"
CMAKE_INSTALL_PYTHONDIR "${PYTHON_SITE_PACKAGES}"
)
set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}"
--
GitLab