Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 15:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CMake to new DLU standard.

Browse Source
This commit is contained in:
Jett 2022-07-17 16:24:05 +01:00
parent e37f1bcee3
commit 67e7b7486c
4 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@ -161,14 +161,6 @@ foreach (dir ${INCLUDED_DIRECTORIES})
include_directories(${PROJECT_SOURCE_DIR}/${dir}) include_directories(${PROJECT_SOURCE_DIR}/${dir})
endforeach() endforeach()
# Link dGame to LUA
if(__include_lua__)
find_package(Lua REQUIRED)
include_directories(/usr/include ${LUA_INCLUDE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/dLua/)
endif(UNIX)
# Add linking directories: # Add linking directories:
link_directories(${PROJECT_BINARY_DIR}) link_directories(${PROJECT_BINARY_DIR})
@ -211,6 +203,7 @@ add_subdirectory(dDatabase)
add_subdirectory(dChatFilter) add_subdirectory(dChatFilter)
add_subdirectory(dNet) add_subdirectory(dNet)
add_subdirectory(dScripts) # Add for dGame to use add_subdirectory(dScripts) # Add for dGame to use
add_subdirectory(dLua)
add_subdirectory(dGame) add_subdirectory(dGame)
add_subdirectory(dZoneManager) add_subdirectory(dZoneManager)
add_subdirectory(dPhysics) add_subdirectory(dPhysics)
@ -246,38 +239,17 @@ target_precompile_headers(
${HEADERS_DZONEMANAGER} ${HEADERS_DZONEMANAGER}
) )
# If we are including LUA, include the dLua files in dGame # Need to specify to use the CXX compiler language here or else we get errors including <string>.
#if(__include_lua__) target_precompile_headers(
# file( dDatabase PRIVATE
# GLOB SOURCES_DLUA "$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE}>"
# LIST_DIRECTORIES false )
# RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
# ${PROJECT_SOURCE_DIR}/dLua/*.cpp
# )
# Append the dLua files to the dGame files
#set(SOURCES_DGAME ${SOURCES_DGAME} ${SOURCES_DLUA})
#endif(__include_lua__)
## Need to specify to use the CXX compiler language here or else we get errors including <string>.
#target_precompile_headers(
# dDatabase PRIVATE
# "$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE}>"
#)
target_precompile_headers( target_precompile_headers(
dCommon PRIVATE dCommon PRIVATE
${HEADERS_DCOMMON} ${HEADERS_DCOMMON}
) )
# Link dGame to LUA
#if(__include_lua__)
# find_package(Lua REQUIRED)
# target_link_libraries(dGame ${LUA_LIBRARIES})
# message(STATUS "Linking dGame to LUA " ${LUA_LIBRARIES})
#endif(UNIX)
target_precompile_headers( target_precompile_headers(
tinyxml2 PRIVATE tinyxml2 PRIVATE
"$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.h>" "$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.h>"

14
dGame/CMakeLists.txt
View File

@ -54,6 +54,20 @@ foreach(file ${DSCRIPT_SOURCES})
set(DGAME_SOURCES ${DGAME_SOURCES} "${PROJECT_SOURCE_DIR}/dScripts/${file}") set(DGAME_SOURCES ${DGAME_SOURCES} "${PROJECT_SOURCE_DIR}/dScripts/${file}")
endforeach() endforeach()
set(DGAME_LIBRARIES dDatabase)
# If we are including LUA, include the dLua files in dGame
if(__include_lua__)
# Append the dLua files to the dGame files
set(DGAME_SOURCES ${DGAME_SOURCES} ${DGAME_DLUA})
find_package(Lua REQUIRED)
set(DGAME_LIBRARIES ${DGAME_LIBRARIES} ${LUA_LIBRARIES})
message(STATUS "Linking dGame to LUA " ${LUA_LIBRARIES})
endif()
add_library(dGame STATIC ${DGAME_SOURCES}) add_library(dGame STATIC ${DGAME_SOURCES})
target_link_libraries(dGame dDatabase) target_link_libraries(dGame dDatabase)

5
dLua/CMakeLists.txt Normal file
View File

@ -0,0 +1,5 @@
set(DGAME_DLUA "dLua.cpp"
"lCommonTypes.cpp"
"lEntity.cpp"
"LuaScript.cpp"
PARENT_SCOPE)

8
thirdparty/CMakeLists.txt vendored
View File

@ -233,4 +233,12 @@ if(UNIX AND NOT APPLE)
link_directories(${backtrace_SOURCE_DIR}/.libs/) link_directories(${backtrace_SOURCE_DIR}/.libs/)
include_directories(${backtrace_SOURCE_DIR}) include_directories(${backtrace_SOURCE_DIR})
endif() endif()
endif()
# Link dGame to LUA
if(__include_lua__)
find_package(Lua REQUIRED)
include_directories(/usr/include ${LUA_INCLUDE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/dLua/)
endif() endif()