diff --git a/CMakeLists.txt b/CMakeLists.txt index 755d2f88c974d336ad51340aeb34249714655231..a851009907345f4ff50958471eaf40659dc4bbf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,6 +177,14 @@ if(ADIOS2_HAVE_Fortran) message("") endif() message(" Installation prefix: ${CMAKE_INSTALL_PREFIX}") +message(" bin: ${CMAKE_INSTALL_BINDIR}") +message(" lib: ${CMAKE_INSTALL_LIBDIR}") +message(" include: ${CMAKE_INSTALL_INCLUDEDIR}") +message(" cmake: ${CMAKE_INSTALL_CMAKEDIR}") +if(ADIOS2_HAVE_Python) + message(" python: ${CMAKE_INSTALL_PYTHONDIR}") +endif() +message("") message(" Features:") if(BUILD_SHARED_LIBS) set(msg_lib_type "shared") diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index a6ced9fc20570ec0b41b0343ea705906cf1b284a..a408b6e679416caa437b0d2a9093d21dc124690a 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -18,9 +18,8 @@ if(ADIOS2_HAVE_MPI) target_link_libraries(adios2py PRIVATE PythonModule::mpi4py) endif() -string(REGEX REPLACE - "^${PYTHON_PREFIX}/[^/]*/python" "${CMAKE_INSTALL_LIBDIR}/python" - CMAKE_INSTALL_PYTHONDIR "${PYTHON_SITE_PACKAGES}" +set(CMAKE_INSTALL_PYTHONDIR + "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" ) set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}" CACHE INTERNAL "" FORCE @@ -30,6 +29,6 @@ set_target_properties(adios2py PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR} RUNTIME_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR} ) -install(TARGETS adios2py +install(TARGETS adios2py DESTINATION ${CMAKE_INSTALL_PYTHONDIR} )