mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11196] Some cmake PREFIX related fixes:

Browse source 
* PREFIX variable doesn't reset CMAKE_INSTALL_PREFIX anymore

* List PREFIX in variable list

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
cipherCOM 2011-02-22 19:50:05 +03:00 • committed by VladimirMangos
parent 43bdd4910a
commit fd39a2bdb9
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -119,18 +119,17 @@ endif()
# option(TOOLS "Build tools" 0) # option(TOOLS "Build tools" 0)
# Set up the install-prefix # 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) if(PREFIX)
string(REGEX REPLACE "^~" "$ENV{HOME}" PREFIX ${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() else()
set(PREFIX ${CMAKE_SOURCE_DIR}) set(PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install path prefix.")
message(
"You probably want to set the PREFIX option. If not set MaNGOS will be installed to ${CMAKE_SOURCE_DIR}."
)
endif() endif()
set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE STRING
"Install path prefix, prepended onto install directories."
FORCE
)
set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11195" #define REVISION_NR "11196"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__