incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix alignment in CMakeLists

Browse Source
This commit is contained in:
Martin Michelsen
2023-06-18 22:39:56 -07:00
parent 3226efab1e
commit aead8aae71
1 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+69 -67
View File
@@ -40,75 +40,77 @@ find_package(resource_file QUIET)
# Executable definition # Executable definition
add_executable(newserv add_executable(newserv
src/BMLArchive.cc src/BattleParamsIndex.cc
src/CatSession.cc src/BMLArchive.cc
src/Channel.cc src/CatSession.cc
src/ChatCommands.cc src/Channel.cc
src/Client.cc src/ChatCommands.cc
src/CommonItemSet.cc src/Client.cc
src/Compression.cc src/CommonItemSet.cc
src/DNSServer.cc src/Compression.cc
src/Episode3/AssistServer.cc src/DNSServer.cc
src/Episode3/BattleRecord.cc src/EnemyType.cc
src/Episode3/Card.cc src/Episode3/AssistServer.cc
src/Episode3/CardSpecial.cc src/Episode3/BattleRecord.cc
src/Episode3/DataIndex.cc src/Episode3/Card.cc
src/Episode3/DeckState.cc src/Episode3/CardSpecial.cc
src/Episode3/MapState.cc src/Episode3/DataIndex.cc
src/Episode3/PlayerState.cc src/Episode3/DeckState.cc
src/Episode3/PlayerStateSubordinates.cc src/Episode3/MapState.cc
src/Episode3/RulerServer.cc src/Episode3/PlayerState.cc
src/Episode3/Server.cc src/Episode3/PlayerStateSubordinates.cc
src/Episode3/Tournament.cc src/Episode3/RulerServer.cc
src/FileContentsCache.cc src/Episode3/Server.cc
src/FunctionCompiler.cc src/Episode3/Tournament.cc
src/GSLArchive.cc src/FileContentsCache.cc
src/IPFrameInfo.cc src/FunctionCompiler.cc
src/IPStackSimulator.cc src/GSLArchive.cc
src/ItemCreator.cc src/IPFrameInfo.cc
src/ItemData.cc src/IPStackSimulator.cc
src/ItemParameterTable.cc src/ItemCreator.cc
src/Items.cc src/ItemData.cc
src/LevelTable.cc src/ItemParameterTable.cc
src/License.cc src/Items.cc
src/Lobby.cc src/LevelTable.cc
src/Loggers.cc src/License.cc
src/Main.cc src/Lobby.cc
src/Map.cc src/Loggers.cc
src/Menu.cc src/Main.cc
src/NetworkAddresses.cc src/Map.cc
src/PatchFileIndex.cc src/Menu.cc
src/Player.cc src/NetworkAddresses.cc
src/Product.cc src/PatchFileIndex.cc
src/ProxyCommands.cc src/Player.cc
src/ProxyServer.cc src/Product.cc
src/PSOEncryption.cc src/ProxyCommands.cc
src/PSOGCObjectGraph.cc src/ProxyServer.cc
src/PSOProtocol.cc src/PSOEncryption.cc
src/Quest.cc src/PSOGCObjectGraph.cc
src/RareItemSet.cc src/PSOProtocol.cc
src/ReceiveCommands.cc src/Quest.cc
src/ReceiveSubcommands.cc src/RareItemSet.cc
src/ReplaySession.cc src/ReceiveCommands.cc
src/SaveFileFormats.cc src/ReceiveSubcommands.cc
src/SendCommands.cc src/ReplaySession.cc
src/Server.cc src/SaveFileFormats.cc
src/ServerShell.cc src/SendCommands.cc
src/ServerState.cc src/Server.cc
src/Shell.cc src/ServerShell.cc
src/StaticGameData.cc src/ServerState.cc
src/Text.cc src/Shell.cc
src/Version.cc src/StaticGameData.cc
src/Text.cc
src/Version.cc
) )
target_include_directories(newserv PUBLIC ${LIBEVENT_INCLUDE_DIR}) target_include_directories(newserv PUBLIC ${LIBEVENT_INCLUDE_DIR})
target_link_libraries(newserv phosg ${LIBEVENT_LIBRARIES} pthread) target_link_libraries(newserv phosg ${LIBEVENT_LIBRARIES} pthread)
if(resource_file_FOUND) if(resource_file_FOUND)
target_compile_definitions(newserv PUBLIC HAVE_RESOURCE_FILE) target_compile_definitions(newserv PUBLIC HAVE_RESOURCE_FILE)
target_link_libraries(newserv resource_file) target_link_libraries(newserv resource_file)
message(STATUS "libresource_file found; enabling patch support") message(STATUS "libresource_file found; enabling patch support")
else() else()
message(WARNING "libresource_file not found; disabling patch support") message(WARNING "libresource_file not found; disabling patch support")
endif() endif()
@@ -120,10 +122,10 @@ enable_testing()
file(GLOB TestCases ${CMAKE_SOURCE_DIR}/tests/*.test.txt) file(GLOB TestCases ${CMAKE_SOURCE_DIR}/tests/*.test.txt)
foreach(TestCase IN ITEMS ${TestCases}) foreach(TestCase IN ITEMS ${TestCases})
add_test( add_test(
NAME ${TestCase} NAME ${TestCase}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${CMAKE_BINARY_DIR}/newserv replay-log ${TestCase} --config=${CMAKE_SOURCE_DIR}/tests/config.json --require-password=11111111 --require-access-key=111111111111) COMMAND ${CMAKE_BINARY_DIR}/newserv replay-log ${TestCase} --config=${CMAKE_SOURCE_DIR}/tests/config.json --require-password=11111111 --require-access-key=111111111111)
endforeach() endforeach()
add_test( add_test(