From fd39a2bdb978044db4521f193df5e845cc141b7d Mon Sep 17 00:00:00 2001 From: cipherCOM Date: Tue, 22 Feb 2011 19:50:05 +0300 Subject: [PATCH] [11196] Some cmake PREFIX related fixes: * PREFIX variable doesn't reset CMAKE_INSTALL_PREFIX anymore * List PREFIX in variable list Signed-off-by: VladimirMangos --- CMakeLists.txt | 15 +++++++-------- src/shared/revision_nr.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b674ab4c..c3e56e2e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,18 +119,17 @@ endif() # option(TOOLS "Build tools" 0) # Set up the install-prefix +if(CMAKE_INSTALL_PREFIX STREQUAL "/usr/local") + get_filename_component(PREFIX_ABSOLUTE "../mangos-server" ABSOLUTE) + set(CMAKE_INSTALL_PREFIX ${PREFIX_ABSOLUTE} CACHE PATH "Install path prefix." FORCE) +endif() if(PREFIX) string(REGEX REPLACE "^~" "$ENV{HOME}" PREFIX ${PREFIX}) + get_filename_component(PREFIX_ABSOLUTE ${PREFIX} ABSOLUTE) + set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix." FORCE) else() - set(PREFIX ${CMAKE_SOURCE_DIR}) - message( - "You probably want to set the PREFIX option. If not set MaNGOS will be installed to ${CMAKE_SOURCE_DIR}." - ) + set(PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install path prefix.") endif() -set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE STRING - "Install path prefix, prepended onto install directories." - FORCE -) set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ff532b440..5b27afd39 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11195" + #define REVISION_NR "11196" #endif // __REVISION_NR_H__