Commit 328802ea authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon
Browse files

Use consistent output directories

parent ef1a1408
...@@ -17,8 +17,10 @@ project(ADIOS2 VERSION 2.0.0) ...@@ -17,8 +17,10 @@ project(ADIOS2 VERSION 2.0.0)
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# Some boilerplate to setup nice output directories # Some boilerplate to setup nice output directories
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
include(GNUInstallDirs) set(CMAKE_INSTALL_BINDIR bin)
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/adios2") 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") list(INSERT CMAKE_MODULE_PATH 0 "${ADIOS2_SOURCE_DIR}/cmake")
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
......
...@@ -27,7 +27,8 @@ if(ADIOS2_HAVE_MPI) ...@@ -27,7 +27,8 @@ if(ADIOS2_HAVE_MPI)
target_link_libraries(adios2py PRIVATE PythonModule::mpi4py) target_link_libraries(adios2py PRIVATE PythonModule::mpi4py)
endif() endif()
string(REGEX REPLACE "^${PYTHON_PREFIX}/" "" string(REGEX REPLACE
"^${PYTHON_PREFIX}/[^/]*/python" "${CMAKE_INSTALL_LIBDIR}/python"
CMAKE_INSTALL_PYTHONDIR "${PYTHON_SITE_PACKAGES}" CMAKE_INSTALL_PYTHONDIR "${PYTHON_SITE_PACKAGES}"
) )
set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}" set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment