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

[c12569] minor CMake cleanup

Browse source
This commit is contained in:
DasBlub 2013-05-31 09:51:07 +01:00 • committed by Antz
parent 259ad1665c
commit f45fe7c725
2 changed files with 6 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

44
CMakeLists.txt
View file

@ -16,22 +16,21 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
project(MaNGOS)
set(MANGOS_VERSION 0.17)
# CMake policies # CMake policies
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(MaNGOS)
set(MANGOS_VERSION 0.17)
set(CMAKE_MODULE_PATH set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake
) )
# Force out-of-source build # Force out-of-source build
string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
if(BUILDING_IN_SOURCE)
message(FATAL_ERROR message(FATAL_ERROR
"This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build directory and run 'cmake <srcs> [options]' from there." "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build directory and run 'cmake [options] <srcs>' from there."
) )
endif() endif()
@ -83,20 +82,6 @@ if(WIN32)
endif() endif()
endif() endif()
# if(WIN32)
# if(PLATFORM MATCHES X86)
# set(ARCH_FLAGS "/MACHINE:X86")
# else()
# set(ARCH_FLAGS "/MACHINE:X64")
# endif()
# elseif(UNIX)
# if(PLATFORM MATCHES X86)
# set(ARCH_FLAGS "-m32")
# else()
# set(ARCH_FLAGS "-m64")
# endif()
# endif()
option(DEBUG "Debug mode" 0) option(DEBUG "Debug mode" 0)
# option(CLI "With CLI" 1) # Not used by MaNGOS so far # option(CLI "With CLI" 1) # Not used by MaNGOS so far
# option(RA "With Remote Access" 0) # TODO: support remote access # option(RA "With Remote Access" 0) # TODO: support remote access
@ -322,22 +307,6 @@ add_executable(genrev
${GENREV_SRC} ${GENREV_SRC}
) )
# if(WIN32)
# set_target_properties(genrev PROPERTIES
# COMPILE_FLAGS "/MACHINE:X86"
# )
# elseif(UNIX)
# set_target_properties(genrev PROPERTIES
# COMPILE_FLAGS "-m32"
# LINK_FLAGS "-m32"
# )
# endif()
# if(XCODE)
# set_target_properties(genrev PROPERTIES
# XCODE_ATTRIBUTE_ARCHS "i386"
# )
# endif()
get_target_property(GENERATE_EXE genrev LOCATION) get_target_property(GENERATE_EXE genrev LOCATION)
add_custom_target("revision.h" ALL add_custom_target("revision.h" ALL
COMMAND ${GENERATE_EXE} ${CMAKE_SOURCE_DIR} COMMAND ${GENERATE_EXE} ${CMAKE_SOURCE_DIR}
@ -377,9 +346,6 @@ if(WIN32)
endif() endif()
endif() endif()
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAGS}")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAGS}")
# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ARCH_FLAGS}")
if(XCODE) if(XCODE)
if(PLATFORM MATCHES X86) if(PLATFORM MATCHES X86)
set(CMAKE_OSX_ARCHITECTURES i386) set(CMAKE_OSX_ARCHITECTURES i386)

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 "12569" #define REVISION_NR "12570"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__