Differential D2587 Diff 6470 files/0004-cmake-set-python-and-library-path.patch

Changeset View

Standalone View

				diff --git a/CMakeLists.txt b/CMakeLists.txt
				index 4dbf220..f57dd78 100644
				--- a/CMakeLists.txt
				+++ b/CMakeLists.txt
				@@ -308,14 +308,12 @@ elseif(OS_LINUX)

				set(CMAKE_SKIP_BUILD_RPATH FALSE)
				set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
				- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/utopia-documents/lib")
				- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
				- set(LIB_INSTALL_DIR "lib/utopia-documents/lib")
				+ set(LIB_INSTALL_DIR "lib")
				sunnyflunkUnsubmitted Not Done Inline Actions Surely can just be lib64, but leave python where it is sunnyflunk: Surely can just be lib64, but leave python where it is
				set(BIN_INSTALL_DIR "bin")
				set(PLUGIN_INSTALL_DIR "lib/utopia-documents/plugins")
				sunnyflunkUnsubmitted Not Done Inline Actions This probably wants to be `lib64/utopia-documents/plugins` sunnyflunk: This probably wants to be `lib64/utopia-documents/plugins`
				set(RESOURCE_INSTALL_DIR "share/utopia-documents")
				set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install path prefix, prepended onto install directories.")
				- set(PYTHON_INSTALL_DIR "lib/utopia-documents/python")
				+ set(PYTHON_INSTALL_DIR ".")
				elseif(OS_WINDOWS)
				set(BUNDLE_CONTENTS_DIR ".")
				set(LIB_INSTALL_DIR "bin")