From a50159a99a1d9652d71c1ed1e0cb87122e253d90 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Tue, 30 Jun 2015 14:24:52 +0200 Subject: [PATCH] Always install to $prefix/lib, do not use an arch-specific libdir Contributes to Ultimaker/Uranium#42 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bee239975f..916bb795cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,9 +58,9 @@ endif() include(GNUInstallDirs) find_package(PythonInterp 3.4.0 REQUIRED) -set(PYTHON_SITE_PACKAGES_DIR ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE PATH "Install location of Python package") +set(PYTHON_SITE_PACKAGES_DIR ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE PATH "Install location of Python package") install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) -install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) +install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cura) install(DIRECTORY cura DESTINATION ${PYTHON_SITE_PACKAGES_DIR}) install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR})