Buildsystem: Clean up build-process on all platforms
- Windows: Use CMAKE_INSTALL_PREFIX as a 'final install' directory (thanks to paradox for the preload-handling) (New target INSTALL, -not- included as part of ALL_BUILD (must be specifically run for installation to start) - All: Build libmpq library (used for tools) - All: Build extractiontools with hardlinked mpq-library (no need to install it anymore) - All: Move jemalloc from being harddefined to using a CMake string (fixes issue 3378) (thanks to tru.bazoozoo for the idea, alternative added) --HG-- branch : trunk
This commit is contained in:
@@ -98,4 +98,7 @@ endif()
|
||||
if( UNIX )
|
||||
install(TARGETS authserver DESTINATION bin)
|
||||
install(FILES authserver.conf.dist DESTINATION etc)
|
||||
elseif( WIN32 )
|
||||
install(TARGETS authserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
install(FILES authserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
|
||||
@@ -180,7 +180,7 @@ else()
|
||||
collision
|
||||
g3dlib
|
||||
gsoap
|
||||
jemalloc
|
||||
${JEMALLOC_LIB}
|
||||
${SCRIPT_LIB}
|
||||
${READLINE_LIBRARY}
|
||||
${TERMCAP_LIBRARY}
|
||||
@@ -201,5 +201,8 @@ endif()
|
||||
|
||||
if( UNIX )
|
||||
install(TARGETS worldserver DESTINATION bin)
|
||||
install(FILES worldserver.conf.dist DESTINATION etc)
|
||||
install(FILES worldserver.conf.dist DESTINATION etc)
|
||||
elseif( WIN32 )
|
||||
install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
install(FILES worldserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user