From 464b3f12b9abc6c4101027ea4e39e3abfea09abd Mon Sep 17 00:00:00 2001 From: Russell Taylor <taylorrj@ornl.gov> Date: Wed, 30 Mar 2011 21:41:43 +0000 Subject: [PATCH] Put core libraries in lib directory instead of bin. Re #2753. --- Code/Mantid/Build/CMake/LinuxSetup.cmake | 2 +- Code/Mantid/Framework/PythonAPI/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Mantid/Build/CMake/LinuxSetup.cmake b/Code/Mantid/Build/CMake/LinuxSetup.cmake index a0740622a62..dc9d2c381df 100644 --- a/Code/Mantid/Build/CMake/LinuxSetup.cmake +++ b/Code/Mantid/Build/CMake/LinuxSetup.cmake @@ -18,7 +18,7 @@ endif () ########################################################################### set ( BIN_DIR bin ) -set ( LIB_DIR ${BIN_DIR} ) +set ( LIB_DIR lib ) set ( PLUGINS_DIR plugins ) set ( CMAKE_INSTALL_PREFIX /opt/${CMAKE_PROJECT_NAME} ) diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt index f618a9353cd..0aa08611b0b 100644 --- a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt +++ b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt @@ -171,7 +171,7 @@ endif () # Installation settings ########################################################################### -install ( TARGETS PythonAPI DESTINATION ${LIB_DIR} ) +install ( TARGETS PythonAPI DESTINATION ${BIN_DIR} ) install ( FILES ${PY_FILES} DESTINATION ${BIN_DIR} ) install ( DIRECTORY PythonAlgorithms/ DESTINATION ${PLUGINS_DIR}/PythonAlgs PATTERN ".svn" EXCLUDE PATTERN "*.pyc" EXCLUDE ) -- GitLab