nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

always set cmake $CONF_DIR and add in preprocessor defines

Browse Source
This commit is contained in:
Yehonal
2016-08-11 17:05:52 +02:00
parent 34d4accb5b
commit 4330b759b7
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmake/macros/CheckPlatform.cmake
View File

@@ -14,3 +14,5 @@ if(WIN32)
elseif(UNIX)
include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake")
endif()
include("${CMAKE_SOURCE_DIR}/src/cmake/platform/after_platform.cmake")

4
src/cmake/platform/after_platform.cmake Normal file
View File

@@ -0,0 +1,4 @@
if( NOT CONF_DIR )
set(CONF_DIR ${CMAKE_INSTALL_PREFIX})
message(STATUS "Using installation path for configuration files")
endif()

5
src/cmake/showoptions.cmake
View File

@@ -11,8 +11,11 @@ message("")
message("* Install core to : ${CMAKE_INSTALL_PREFIX}")
if( UNIX )
message("* Install libraries to : ${LIBSDIR}")
message("* Install configs to : ${CONF_DIR}")
endif()
message("* Install configs to : ${CONF_DIR}")
add_definitions(-D_CONF_DIR="\\"${CONF_DIR}\\"")
message("")
# Show infomation about the options selected during configuration

4
src/server/authserver/CMakeLists.txt
View File

@@ -98,12 +98,12 @@ endif()
if( UNIX )
install(TARGETS authserver DESTINATION bin)
install(FILES authserver.conf.dist DESTINATION ${CONF_DIR})
elseif( WIN32 )
install(TARGETS authserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
install(FILES authserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}")
endif()
install(FILES authserver.conf.dist DESTINATION ${CONF_DIR})
# Generate precompiled header
if (USE_COREPCH)
add_cxx_pch(authserver ${authserver_PCH_HDR} ${authserver_PCH_SRC})

4
src/server/worldserver/CMakeLists.txt
View File

@@ -198,12 +198,12 @@ endif()
if( UNIX )
install(TARGETS worldserver DESTINATION bin)
install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR})
elseif( WIN32 )
install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
install(FILES worldserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}")
endif()
install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR})
# Generate precompiled header
if( USE_COREPCH )
add_cxx_pch(worldserver ${worldserver_PCH_HDR} ${worldserver_PCH_SRC})