From d42376ecb67388aef609341ac1ed453143d50482 Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Fri, 9 Sep 2016 16:42:58 +0200 Subject: [PATCH 1/5] pass absolute path for DATADIR --- museeq/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/museeq/CMakeLists.txt b/museeq/CMakeLists.txt index 333b70d..0b25943 100644 --- a/museeq/CMakeLists.txt +++ b/museeq/CMakeLists.txt @@ -8,7 +8,7 @@ set(QT_USE_QTUITOOLS TRUE) # find and setup Qt4 for this project find_package(Qt4 REQUIRED) -add_definitions(${QT_DEFINITIONS} ) +add_definitions(${QT_DEFINITIONS}) # tell cmake where to search for headers:v include_directories(.) @@ -17,7 +17,7 @@ include(CheckIncludeFiles) include(CheckTypeSize) include(CheckCXXSourceCompiles) -add_definitions(-DDATADIR="\""${CMAKE_INSTALL_DATADIR}"\"") +add_definitions(-DDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}") if(BINRELOC) add_definitions(-DENABLE_BINRELOC=1) From 1020ef260db919353ab0cad7d3ca02f133141b76 Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Sat, 17 Sep 2016 19:55:51 +0200 Subject: [PATCH 2/5] use CMAKE_INSTALL_FULL_DATADIR to allow for absolute paths --- museeq/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/museeq/CMakeLists.txt b/museeq/CMakeLists.txt index 0b25943..7666d06 100644 --- a/museeq/CMakeLists.txt +++ b/museeq/CMakeLists.txt @@ -17,7 +17,7 @@ include(CheckIncludeFiles) include(CheckTypeSize) include(CheckCXXSourceCompiles) -add_definitions(-DDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}") +add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}") if(BINRELOC) add_definitions(-DENABLE_BINRELOC=1) From 791deb778a05609ef1b4f30a9400da3bb9b86e0c Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Sat, 17 Sep 2016 19:56:22 +0200 Subject: [PATCH 3/5] update INSTALL instructions --- INSTALL | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/INSTALL b/INSTALL index 1a3986e..658a592 100755 --- a/INSTALL +++ b/INSTALL @@ -14,12 +14,10 @@ libogg-dev SWIG (for the mucipher Python bindings) - Get binaries and help for Museek+ there: http://www.museek-plus.org - ----------------------- I - Install using CMake ----------------------- @@ -27,39 +25,43 @@ CMake is the recommended way to build everything I.1 - DECLARATIONS (prefix with -D, set bool options on with 1; off with 0): ---------------------------------------------------------------------------- -PREFIX: Where museek+ should be installed (default is /usr) -MANDIR: Where man files should be installed (default is PREFIX/man) -EVERYTHING: Install every components of museek+ (daemon, clients, bindings, etc.) -NO_MUSEEKD: don't install museekd -NO_MUSCAN: don't install muscan -NO_SETUP: don't install musetup, musetup-gtk and musetup-qt -NO_PYMUCIPHER: don't install python bindings for mucipher (hashing library: SHA1, MD5, ...) -NO_MUSEEQ: don't install museeq (Qt4 client) -BINDINGS: install python bindings for museek -MURMUR: install PyGTK client -MUCOUS: install Curses Python client -CLIENTS: install some Python tools to museekd, featuring a command line client and a very primitive curses chat client. +To customize the installation location, different variables can be set. For an exhaustive list please see the GNUInstallDirs module documentation which is part of cmake. + +Examples: +CMAKE_INSTALL_PREFIX: Where museek+ should be installed (default is /usr/local) +CMAKE_INSTALL_MANDIR: Where man files should be installed (default is share/man) +CMAKE_INSTALL_DATADIR: Where data files should be installed (default is share). Museek will put it's data in a museek/ subfolder relative to this. +Relative paths are appended to CMAKE_INSTALL_PREFIX. Absolute paths are also possible. + +EVERYTHING: Install every components of museek+ (daemon, clients, bindings, etc.) (default 0) +MUSEEKD: Build museekd soulseek daemon (default 1) +MUSETUP: Build musetup configuration interface for museekd (default 1) +MUSEEQ: Build museeq Qt client (default 1) +MUSCAN: Build muscan shared file index generator (default 1) +MUCOUS: Build mucous curses client (default 0) +MURMUR: Build murmur PyGTK client (default 0) +PYMUCIPHER: Generate PyMucipher bindings (default 0) +PYTHON_BINDINGS: Generate python bindings (default 0) +PYTHON_CLIENTS: Build python clients (mulog, museekchat, museekcontrol, musirc) (default 0) Museeq options: BINRELOC: Use binary relocation - DATADIR: Change default data dir RELOAD_TRANSLATIONS: Update .ts files in src/museeq/translations I.2 - Commands -------------- # cd /path/to/src -# mkdir workdir -# cd workdir/ -# cmake -DPREFIX=/usr .. -# (or) cmake -DEVERYTHING=1 -DPREFIX=/usr .. -# (or) cmake -DMUCOUS=0 -DPREFIX=/usr/local -DMANDIR=share/man +# mkdir build/ +# cd build/ +# cmake -CMAKE_INSTALL_DPREFIX=/usr .. +# (or) cmake -DEVERYTHING=1 -DCMAKE_INSTALL_PREFIX=/usr .. +# (or) cmake -DMUCOUS=0 -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_MANDIR=/usr/share/man .. # make # (or) make VERBOSE=1 # make install - ---------------------------------------------------- II - Distutils (Python's built-in installation tool) ---------------------------------------------------- @@ -86,4 +88,3 @@ Setup tools (musetup, musetup-gtk, musetup-qt) Mucous Requires: PyMucipher or PyCrypto, Python Bindings # cd mucous/ - From b2b23045e4f78aa9ae8715470910ea9a625f1ac4 Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Sat, 17 Sep 2016 19:58:14 +0200 Subject: [PATCH 4/5] enable CXX language early for GNUInstallDirs on recent cmake --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0d061e..9a8fd97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,8 @@ cmake_minimum_required(VERSION 2.8.0) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +enable_language(CXX) + # Include some cmake checks. include(CheckIncludeFiles) include(CheckTypeSize) From 0959b649abbe3a24079e460983b2b5a8a1b91ac9 Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Mon, 19 Sep 2016 11:41:34 +0200 Subject: [PATCH 5/5] change example to MUCOUS=1 since off by default --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 658a592..212343c 100755 --- a/INSTALL +++ b/INSTALL @@ -56,7 +56,7 @@ Museeq options: # cd build/ # cmake -CMAKE_INSTALL_DPREFIX=/usr .. # (or) cmake -DEVERYTHING=1 -DCMAKE_INSTALL_PREFIX=/usr .. -# (or) cmake -DMUCOUS=0 -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_MANDIR=/usr/share/man .. +# (or) cmake -DMUCOUS=1 -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_MANDIR=/usr/share/man .. # make # (or) make VERBOSE=1 # make install