Blob Blame History Raw
From 7411b098b07d03bfcc734195e177239f2cf8f7ad Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 2 May 2017 11:02:22 +0200
Subject: [PATCH 5/8] Make bin, lib and pysitearch dirs configurable

---
 CMakeLists.txt         | 7 +++++--
 cmake/SuperBuild.cmake | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04163ea..ff4473a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,12 +97,15 @@ include_directories ("${PROJECT_BINARY_DIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(INCDIR include CACHE PATH "install directory for header files")
+set(BINDIR bin CACHE PATH "install directory for binary files")
+set(LIBDIR lib${LIB_SUFFIX} CACHE PATH "install directory for libraries")
+
 if(APPLE)
   set(ng_install_dir_bin ../MacOS)
   set(ng_install_dir_lib ../MacOS)
 else(APPLE)
-  set(ng_install_dir_bin bin)
-  set(ng_install_dir_lib lib)
+  set(ng_install_dir_bin ${BINDIR})
+  set(ng_install_dir_lib ${LIBDIR})
 endif(APPLE)
 set(ng_install_dir EXPORT netgen-targets RUNTIME DESTINATION ${ng_install_dir_bin} COMPONENT netgen LIBRARY DESTINATION ${ng_install_dir_lib} COMPONENT netgen_devel ARCHIVE DESTINATION ${ng_install_dir_lib} COMPONENT netgen_devel)
 install(EXPORT netgen-targets DESTINATION share/cmake)
diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
index b802b6f..d61c4d5 100644
--- a/cmake/SuperBuild.cmake
+++ b/cmake/SuperBuild.cmake
@@ -79,8 +79,9 @@ if (USE_PYTHON)
     find_package(PythonInterp 3 REQUIRED)
     find_package(PythonLibs 3 REQUIRED)
 
-    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1,0,''))" OUTPUT_VARIABLE PYTHON_PACKAGES_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-    file(TO_CMAKE_PATH ${PYTHON_PACKAGES_INSTALL_DIR} PYTHON_PACKAGES_INSTALL_DIR)
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1,0,''))" OUTPUT_VARIABLE DEFAULT_PYTHON_PACKAGES_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    file(TO_CMAKE_PATH ${DEFAULT_PYTHON_PACKAGES_INSTALL_DIR} DEFAULT_PYTHON_PACKAGES_INSTALL_DIR)
+    SET(PYTHON_PACKAGES_INSTALL_DIR ${DEFAULT_PYTHON_PACKAGES_INSTALL_DIR} CACHE PATH "installation directory for python modules")
     set_vars(NETGEN_CMAKE_ARGS PYTHON_PACKAGES_INSTALL_DIR PYTHON_INCLUDE_DIRS PYTHON_LIBRARIES PYTHON_EXECUTABLE PYTHON_VERSION PYBIND_INCLUDE_DIR)
 endif (USE_PYTHON)
 
-- 
2.12.2