diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | README.RUS | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c78bdc894..60752fcf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.6.0) #freebsd support include_directories(SYSTEM /usr/local/include) -link_directories(/usr/local/lib) -link_directories(/usr/local/lib32) -link_directories(/usr/local/lib64) +#link_directories(/usr/local/lib) +#link_directories(/usr/local/lib32) +#link_directories(/usr/local/lib64) SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) #extract version from qmmp.h @@ -75,6 +75,12 @@ ENDIF(NOT LIB_SUFFIX) SET(LIB_DIR "lib${LIB_SUFFIX}" CACHE STRING "library path") SET(USE_SKINNED TRUE CACHE BOOL "enable/disable standard skinned user interface") SET(USE_DIR_ASSOC TRUE CACHE BOOL "enable/disable inode/directory mime type association") +SET(USE_RPATH FALSE CACHE BOOL "enable/disable RPATH for installing binaries") + +#set RPATH in installed binaries +IF(USE_RPATH AND UNIX AND NOT APPLE) +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +ENDIF(USE_RPATH AND UNIX AND NOT APPLE) pkg_search_module(X11 x11) @@ -194,5 +200,6 @@ MESSAGE("Advanced:") PRINT_SUMMARY ("Skinned user interface ............" USE_SKINNED X11_FOUND) PRINT_SUMMARY ("Automatic charset detection ......." USE_ENCA ENCA_FOUND) PRINT_SUMMARY ("Directory association ............." USE_DIR_ASSOC 1) +PRINT_SUMMARY ("Set RPATH in installed binaries ..." USE_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH) MESSAGE("") @@ -125,7 +125,8 @@ Available options: - USE_QMMP_DIALOG (file dialog); - USE_ENCA (automatic charset detection); - USE_SKINNED (standard skinned UI); -- USE_DIR_ASSOC (inode/directory mime type association) +- USE_DIR_ASSOC (inode/directory mime type association); +- USE_RPATH (enables CMAKE_INSTALL_RPATH_USE_LINK_PATH, see http://www.cmake.org/Wiki/CMake_RPATH_handling for details) Also you can use ccmake for changing plugins configuration. By default program will be installed in /usr/local. You can change default path by running: diff --git a/README.RUS b/README.RUS index 2fe7f540e..ae84fac89 100644 --- a/README.RUS +++ b/README.RUS @@ -121,8 +121,9 @@ cmake ./ -DUSE_JACK:BOOL=FALSE USE_KDENOTIFY, USE_UDISKS2, USE_UDISKS, USE_CONVERTER, USE_TRACKCHANGE, USE_COPYPASTE (модули общего назначения); - USE_QMMP_DIALOG (файловый диалог); - USE_ENCA (автоматическое определение кодировки); -- USE_SKINNED (стандартный пользовательский интерфейс) -- USE_DIR_ASSOC (привязка к mime-типу inode/directory) +- USE_SKINNED (стандартный пользовательский интерфейс); +- USE_DIR_ASSOC (привязка к mime-типу inode/directory); +- USE_RPATH (включает опцию CMAKE_INSTALL_RPATH_USE_LINK_PATH, см. http://www.cmake.org/Wiki/CMake_RPATH_handling) Также вы можете использовать ccmake для изменения конфигурации модулей. По умолчанию программа будет установлена в /usr/local. Вы можете изменить этот путь командой: |