Group :: Education
RPM: veyon
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: alt-veyon-libdir.patch
Download
Download
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 071d9328e..22d9f6676 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,19 +127,19 @@ if(VEYON_BUILD_ANDROID)
set(VEYON_TRANSLATIONS_DIR "/translations")
else()
if(CMAKE_INSTALL_LIBDIR)
- set(VEYON_LIB_DIR "${CMAKE_INSTALL_LIBDIR}/veyon" CACHE INTERNAL "Veyon library directory")
+ set(VEYON_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE INTERNAL "Veyon library directory")
else()
set(VEYON_LIB_DIR lib/veyon CACHE INTERNAL "Veyon library directory")
endif()
- set(VEYON_INSTALL_PLUGIN_DIR "${VEYON_LIB_DIR}")
+ set(VEYON_INSTALL_PLUGIN_DIR "${VEYON_LIB_DIR}/veyon")
set(VEYON_INSTALL_DATA_DIR "${CMAKE_INSTALL_DATADIR}/veyon")
if(WIN32)
set(VEYON_PLUGIN_DIR "plugins")
set(VEYON_TRANSLATIONS_DIR "translations")
else()
- set(VEYON_PLUGIN_DIR "../${VEYON_LIB_DIR}")
+ set(VEYON_PLUGIN_DIR "../${VEYON_LIB_DIR}/veyon")
set(VEYON_TRANSLATIONS_DIR "../share/veyon/translations")
endif()
endif()
@@ -251,7 +255,7 @@ set(qthttpserver_DIR ${3rdparty_DIR}/qthttpserver)
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VEYON_LIB_DIR}")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
# make sub-directories
add_subdirectory(core)