diff --git a/CMakeLists.txt b/CMakeLists.txt index b3102216022dbffab49604330787d9944cabfc83..277693443fa050f22b374f2f32f1628e71811178 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 1f06042875f41132e8b8fd7aeea92ba62fb454e2..8403e7306894667f7b63a93f844a4562d938d0d3 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}"