diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e2aeb3..72ff3cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ project(fmm) set(CMAKE_BUILD_TYPE "Release") set(CMAKE_CXX_FLAGS "-O3 -DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE") -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 7c042f2..4d3e0b6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() execute_process( - COMMAND python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())" + COMMAND python -c "import site; print(site.getsitepackages())" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) message(STATUS "Python packages ${PYTHON_SITE_PACKAGES}") @@ -29,15 +29,15 @@ if (${CMAKE_VERSION} VERSION_LESS 3.13.0) message(STATUS "Using swig add module") SWIG_ADD_MODULE(fmm python ${PROJECT_SOURCE_DIR}/python/fmm.i) swig_link_libraries(fmm FMMLIB ${PYTHON_LIBRARIES}) - install(TARGETS ${SWIG_MODULE_fmm_REAL_NAME} DESTINATION ${PYTHON_SITE_PACKAGES}) + install(TARGETS ${SWIG_MODULE_fmm_REAL_NAME} DESTINATION include ${PYTHON_SITE_PACKAGES}) else() - message(STATUS "Using swig add library") + message(STATUS "Using swig add library ${DESTINATION}") SWIG_ADD_LIBRARY(pyfmm LANGUAGE python SOURCES ${PROJECT_SOURCE_DIR}/python/fmm.i) set_property(TARGET pyfmm PROPERTY OUTPUT_NAME fmm) swig_link_libraries(pyfmm FMMLIB ${PYTHON_LIBRARIES}) - install(TARGETS pyfmm DESTINATION ${PYTHON_SITE_PACKAGES}) + install(TARGETS pyfmm DESTINATION include ${PYTHON_SITE_PACKAGES}) endif() -install(FILES ${CMAKE_BINARY_DIR}/python/fmm.py DESTINATION ${PYTHON_SITE_PACKAGES}) +install(FILES ${CMAKE_BINARY_DIR}/python/fmm.py DESTINATION include ${PYTHON_SITE_PACKAGES})