Update: #842 Applied some patches and fixed include directories for CMake.
This commit is contained in:
parent
170b198703
commit
89b7dae7c0
13 changed files with 200 additions and 204 deletions
|
@ -77,11 +77,17 @@ SET(WITH_3D ON )
|
||||||
|
|
||||||
FIND_PACKAGE(Threads REQUIRED)
|
FIND_PACKAGE(Threads REQUIRED)
|
||||||
FIND_PACKAGE(LibXml2 REQUIRED)
|
FIND_PACKAGE(LibXml2 REQUIRED)
|
||||||
FIND_PACKAGE(Lua50 REQUIRED)
|
IF(WITH_LUA51)
|
||||||
|
FIND_PACKAGE(Lua51 REQUIRED)
|
||||||
|
ELSE(WITH_LUA51)
|
||||||
|
FIND_PACKAGE(Lua50 REQUIRED)
|
||||||
|
ENDIF(WITH_LUA51)
|
||||||
FIND_PACKAGE(CURL REQUIRED)
|
FIND_PACKAGE(CURL REQUIRED)
|
||||||
FIND_PACKAGE(Libwww)
|
FIND_PACKAGE(Libwww)
|
||||||
FIND_PACKAGE(X11)
|
|
||||||
|
|
||||||
|
IF(NOT WIN32)
|
||||||
|
FIND_PACKAGE(X11)
|
||||||
|
ENDIF(NOT WIN32)
|
||||||
|
|
||||||
NL_SETUP_BUILD()
|
NL_SETUP_BUILD()
|
||||||
|
|
||||||
|
@ -89,37 +95,6 @@ NL_CONFIGURE_CHECKS()
|
||||||
|
|
||||||
FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED)
|
FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED)
|
||||||
|
|
||||||
###
|
|
||||||
# An example of finding NeL 3D and CEGUI Renderer.
|
|
||||||
###
|
|
||||||
IF(WITH_3D)
|
|
||||||
FIND_PACKAGE(FreeType)
|
|
||||||
# FIND_PACKAGE(NeL3D)
|
|
||||||
FIND_PACKAGE(Jpeg)
|
|
||||||
#
|
|
||||||
# IF(WITH_DRIVER_OPENGL)
|
|
||||||
# FIND_PACKAGE(OpenGL)
|
|
||||||
# FIND_PACKAGE(NeLDriverGL)
|
|
||||||
# ENDIF(WITH_DRIVER_OPENGL)
|
|
||||||
#
|
|
||||||
# IF(WITH_CEGUI)
|
|
||||||
# FIND_PACKAGE(CEGUI)
|
|
||||||
# FIND_PACKAGE(NeLCEGUIRenderer)
|
|
||||||
# ENDIF(WITH_CEGUI)
|
|
||||||
#
|
|
||||||
# SET(JPEG_LIB jpeg)
|
|
||||||
ENDIF(WITH_3D)
|
|
||||||
|
|
||||||
###
|
|
||||||
# An example of finding sound and a driver.
|
|
||||||
###
|
|
||||||
#IF(WITH_SOUND)
|
|
||||||
# FIND_PACKAGE(NeLSound)
|
|
||||||
# IF(WITH_DRIVER_OPENAL)
|
|
||||||
# FIND_PACKAGE(OpenAL)
|
|
||||||
# FIND_PACKAGE(NeLDriverAL)
|
|
||||||
# ENDIF(WITH_DRIVER_OPENAL)
|
|
||||||
#ENDIF(WITH_SOUND)
|
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
||||||
|
@ -132,6 +107,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
|
||||||
NL_SETUP_BUILD_FLAGS()
|
NL_SETUP_BUILD_FLAGS()
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(common)
|
ADD_SUBDIRECTORY(common)
|
||||||
ADD_SUBDIRECTORY(client)
|
|
||||||
ADD_SUBDIRECTORY(tools)
|
IF(WITH_CLIENT)
|
||||||
|
ADD_SUBDIRECTORY(client)
|
||||||
|
ENDIF(WITH_CLIENT)
|
||||||
|
|
||||||
|
IF(WITH_TOOLS)
|
||||||
|
ADD_SUBDIRECTORY(tools)
|
||||||
|
ENDIF(WITH_TOOLS)
|
||||||
|
|
||||||
|
|
|
@ -5,164 +5,173 @@ MACRO(CHECK_OUT_OF_SOURCE)
|
||||||
IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||||
MESSAGE(FATAL_ERROR "
|
MESSAGE(FATAL_ERROR "
|
||||||
|
|
||||||
CMake generation for this project is not allowed within the source directory!
|
CMake generation for this project is not allowed within the source directory!
|
||||||
Remove the CMakeCache.txt file and try again from another folder, e.g.:
|
Remove the CMakeCache.txt file and try again from another folder, e.g.:
|
||||||
|
|
||||||
rm CMakeCache.txt
|
rm CMakeCache.txt
|
||||||
mkdir cmake
|
mkdir cmake
|
||||||
cd cmake
|
cd cmake
|
||||||
cmake -G \"Unix Makefiles\" ..
|
cmake -G \"Unix Makefiles\" ..
|
||||||
")
|
")
|
||||||
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||||
|
|
||||||
ENDMACRO(CHECK_OUT_OF_SOURCE)
|
ENDMACRO(CHECK_OUT_OF_SOURCE)
|
||||||
|
|
||||||
MACRO(NL_SETUP_DEFAULT_OPTIONS)
|
MACRO(NL_SETUP_DEFAULT_OPTIONS)
|
||||||
###
|
###
|
||||||
# Features
|
# Build options
|
||||||
###
|
###
|
||||||
OPTION(WITH_LOGGING "With Logging" ON )
|
|
||||||
OPTION(WITH_COVERAGE "With Code Coverage Support" OFF)
|
OPTION(WITH_CLIENT "Build Ryzom Core Client" ON )
|
||||||
|
OPTION(WITH_TOOLS "Build Ryzom Core Tools" ON )
|
||||||
###
|
OPTION(WITH_SERVER "Build Ryzom Core Services" ON )
|
||||||
# Optional support
|
OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" OFF)
|
||||||
###
|
|
||||||
OPTION(WITH_SOUND "Build Sound Support" OFF)
|
###
|
||||||
OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF)
|
# Features
|
||||||
ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
|
###
|
||||||
|
OPTION(WITH_LOGGING "With Logging" ON )
|
||||||
|
OPTION(WITH_COVERAGE "With Code Coverage Support" OFF)
|
||||||
|
|
||||||
|
###
|
||||||
|
# Optional support
|
||||||
|
###
|
||||||
|
OPTION(WITH_SOUND "Build Sound Support" OFF)
|
||||||
|
OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF)
|
||||||
|
ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
|
||||||
|
|
||||||
|
|
||||||
MACRO(NL_SETUP_BUILD)
|
MACRO(NL_SETUP_BUILD)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Setup the buildmode variables.
|
# Setup the buildmode variables.
|
||||||
#
|
#
|
||||||
# None = NL_RELEASE_DEBUG
|
# None = NL_RELEASE_DEBUG
|
||||||
# Debug = NL_DEBUG
|
# Debug = NL_DEBUG
|
||||||
# Release = NL_RELEASE
|
# Release = NL_RELEASE
|
||||||
# RelWithDebInfo = NL_RELEASE_DEBUG
|
# RelWithDebInfo = NL_RELEASE_DEBUG
|
||||||
# MinSizeRel = NL_RELEASE_DEBUG
|
# MinSizeRel = NL_RELEASE_DEBUG
|
||||||
|
|
||||||
# None = NL_RELEASE
|
# None = NL_RELEASE
|
||||||
# Debug = NL_DEBUG
|
# Debug = NL_DEBUG
|
||||||
# Release = NL_RELEASE, NL_NO_DEBUG
|
# Release = NL_RELEASE, NL_NO_DEBUG
|
||||||
# RelWithDebInfo = NL_RELEASE
|
# RelWithDebInfo = NL_RELEASE
|
||||||
# MinSizeRel = NL_RELEASE, NL_NO_DEBUG
|
# MinSizeRel = NL_RELEASE, NL_NO_DEBUG
|
||||||
|
|
||||||
IF(CMAKE_BUILD_TYPE MATCHES "Debug")
|
IF(CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||||
SET(NL_BUILD_MODE "NL_DEBUG")
|
SET(NL_BUILD_MODE "NL_DEBUG")
|
||||||
ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
|
ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||||
IF(CMAKE_BUILD_TYPE MATCHES "Release")
|
IF(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||||
SET(NL_BUILD_MODE "NL_RELEASE")
|
SET(NL_BUILD_MODE "NL_RELEASE")
|
||||||
ELSE(CMAKE_BUILD_TYPE MATCHES "Release")
|
ELSE(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||||
SET(NL_BUILD_MODE "NL_RELEASE")
|
SET(NL_BUILD_MODE "NL_RELEASE")
|
||||||
# enforce release mode if it's neither Debug nor Release
|
# enforce release mode if it's neither Debug nor Release
|
||||||
SET(CMAKE_BUILD_TYPE "Release")
|
SET(CMAKE_BUILD_TYPE "Release")
|
||||||
ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
|
ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||||
ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
|
ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-")
|
SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-")
|
||||||
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
|
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
|
||||||
SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
|
SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
|
SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
|
||||||
IF(WITH_COVERAGE)
|
IF(WITH_COVERAGE)
|
||||||
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
|
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
|
||||||
ENDIF(WITH_COVERAGE)
|
ENDIF(WITH_COVERAGE)
|
||||||
SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
|
SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
|
||||||
SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
|
SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
|
||||||
SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
|
SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
|
||||||
SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
|
SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
|
||||||
SET(NL_NONE_CFLAGS "-DNL_RELEASE -g -finline-functions -O2 ")
|
SET(NL_NONE_CFLAGS "-DNL_RELEASE -g -finline-functions -O2 ")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
# Determine host CPU
|
# Determine host CPU
|
||||||
IF(UNIX AND NOT WIN32)
|
IF(UNIX AND NOT WIN32)
|
||||||
FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
|
FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
|
||||||
IF(CMAKE_UNAME)
|
IF(CMAKE_UNAME)
|
||||||
EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
|
EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
|
||||||
SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
|
SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
|
||||||
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||||
ADD_DEFINITIONS(-DHAVE_X86_64)
|
ADD_DEFINITIONS(-DHAVE_X86_64)
|
||||||
ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
|
ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
|
||||||
ADD_DEFINITIONS(-DHAVE_IA64)
|
ADD_DEFINITIONS(-DHAVE_IA64)
|
||||||
ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||||
ADD_DEFINITIONS(-DHAVE_X86)
|
ADD_DEFINITIONS(-DHAVE_X86)
|
||||||
ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||||
ELSE(CMAKE_UNAME) # Assume that if uname is not found that we're x86.
|
ELSE(CMAKE_UNAME) # Assume that if uname is not found that we're x86.
|
||||||
ADD_DEFINITIONS(-DHAVE_X86)
|
ADD_DEFINITIONS(-DHAVE_X86)
|
||||||
ENDIF(CMAKE_UNAME)
|
ENDIF(CMAKE_UNAME)
|
||||||
ENDIF(UNIX AND NOT WIN32)
|
ENDIF(UNIX AND NOT WIN32)
|
||||||
|
|
||||||
ENDMACRO(NL_SETUP_BUILD)
|
ENDMACRO(NL_SETUP_BUILD)
|
||||||
|
|
||||||
MACRO(NL_SETUP_BUILD_FLAGS)
|
MACRO(NL_SETUP_BUILD_FLAGS)
|
||||||
## None
|
## None
|
||||||
#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
|
|
||||||
## Debug
|
## Debug
|
||||||
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
|
|
||||||
## Release
|
## Release
|
||||||
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
|
|
||||||
## RelWithDebInfo
|
## RelWithDebInfo
|
||||||
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
|
|
||||||
## MinSizeRel
|
## MinSizeRel
|
||||||
SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||||
ENDMACRO(NL_SETUP_BUILD_FLAGS)
|
ENDMACRO(NL_SETUP_BUILD_FLAGS)
|
||||||
|
|
||||||
MACRO(NL_SETUP_PREFIX_PATHS)
|
MACRO(NL_SETUP_PREFIX_PATHS)
|
||||||
## Allow override of install_prefix/etc path.
|
## Allow override of install_prefix/etc path.
|
||||||
IF(NOT NL_ETC_PREFIX)
|
IF(NOT NL_ETC_PREFIX)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(NL_ETC_PREFIX "../etc" CACHE PATH "Installation path for configurations")
|
SET(NL_ETC_PREFIX "../etc" CACHE PATH "Installation path for configurations")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Installation path for configurations")
|
SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Installation path for configurations")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
ENDIF(NOT NL_ETC_PREFIX)
|
ENDIF(NOT NL_ETC_PREFIX)
|
||||||
|
|
||||||
## Allow override of install_prefix/share path.
|
## Allow override of install_prefix/share path.
|
||||||
IF(NOT NL_SHARE_PREFIX)
|
IF(NOT NL_SHARE_PREFIX)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(NL_SHARE_PREFIX "../share" CACHE PATH "Installation path for data.")
|
SET(NL_SHARE_PREFIX "../share" CACHE PATH "Installation path for data.")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Installation path for data.")
|
SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Installation path for data.")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
ENDIF(NOT NL_SHARE_PREFIX)
|
ENDIF(NOT NL_SHARE_PREFIX)
|
||||||
|
|
||||||
## Allow override of install_prefix/sbin path.
|
## Allow override of install_prefix/sbin path.
|
||||||
IF(NOT NL_SBIN_PREFIX)
|
IF(NOT NL_SBIN_PREFIX)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.")
|
SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.")
|
SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
ENDIF(NOT NL_SBIN_PREFIX)
|
ENDIF(NOT NL_SBIN_PREFIX)
|
||||||
|
|
||||||
## Allow override of install_prefix/bin path.
|
## Allow override of install_prefix/bin path.
|
||||||
IF(NOT NL_BIN_PREFIX)
|
IF(NOT NL_BIN_PREFIX)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.")
|
SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.")
|
SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
ENDIF(NOT NL_BIN_PREFIX)
|
ENDIF(NOT NL_BIN_PREFIX)
|
||||||
|
|
||||||
## Allow override of install_prefix/bin path.
|
## Allow override of install_prefix/bin path.
|
||||||
IF(NOT NL_LOG_PREFIX)
|
IF(NOT NL_LOG_PREFIX)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.")
|
SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.")
|
SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
ENDIF(NOT NL_LOG_PREFIX)
|
ENDIF(NOT NL_LOG_PREFIX)
|
||||||
|
|
||||||
ENDMACRO(NL_SETUP_PREFIX_PATHS)
|
ENDMACRO(NL_SETUP_PREFIX_PATHS)
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
FILE(GLOB SRC *.cpp *.h)
|
FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
|
LIST(REMOVE_ITEM SRC
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ record.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 2\ of\ record.cpp)
|
||||||
|
|
||||||
ADD_EXECUTABLE(assoc_mem ${SRC})
|
ADD_EXECUTABLE(assoc_mem ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(alias_synchronizer ${SRC})
|
ADD_EXECUTABLE(alias_synchronizer ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELLIGO_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY})
|
TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(make_alias_file ${SRC})
|
ADD_EXECUTABLE(make_alias_file ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(make_anim_by_race ${SRC})
|
ADD_EXECUTABLE(make_anim_by_race ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(make_anim_melee_impact ${SRC})
|
ADD_EXECUTABLE(make_anim_melee_impact ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(make_anim_melee_impact ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
TARGET_LINK_LIBRARIES(make_anim_melee_impact ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
|
SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
|
||||||
SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
|
SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
|
|
||||||
ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
|
ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
|
||||||
TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(pd_parser ${SRC})
|
ADD_EXECUTABLE(pd_parser ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(pdr_util ${SRC})
|
ADD_EXECUTABLE(pdr_util ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(skill_extractor ${SRC})
|
ADD_EXECUTABLE(skill_extractor ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
FILE(GLOB SRC *.cpp *.h)
|
FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
|
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ char_commands.cpp)
|
||||||
|
|
||||||
ADD_EXECUTABLE(stats_scan ${SRC})
|
ADD_EXECUTABLE(stats_scan ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(translation_tools ${SRC})
|
ADD_EXECUTABLE(translation_tools ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELLIGO_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue