diff --git a/CMakeLists.txt b/CMakeLists.txt index eafaaf82b..f411449ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,9 @@ endif() mark_as_advanced(DISTBUILD) set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}") +if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + set(CMAKE_SKIP_RPATH ON) +endif() if (NOT DEFINED MANDIR) set(MANDIR ${CMAKE_INSTALL_MANDIR}) diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 611f6136b..9ad0d27f1 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -311,7 +311,6 @@ if(BUILD_GL OR BUILD_GLES2 OR BUILD_EPOXY) install(DIRECTORY ${CMAKE_SOURCE_DIR}/res/shaders DESTINATION ${DATADIR} COMPONENT ${BINARY_NAME}-qt) endif() if(ENABLE_SCRIPTING AND USE_LUA) - message(STATUS ${CMAKE_SOURCE_DIR}/res/scripts) install(DIRECTORY ${CMAKE_SOURCE_DIR}/res/scripts DESTINATION ${DATADIR} COMPONENT ${BINARY_NAME}-qt) endif() install(FILES ${CMAKE_SOURCE_DIR}/res/nointro.dat DESTINATION ${DATADIR} COMPONENT ${BINARY_NAME}-qt)