Skip to content

Commit a319004

Browse files
committed
CMake: Use conventional name for the server target
1 parent 931fa81 commit a319004

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

CMakeLists.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,18 +1115,18 @@ add_custom_command(
11151115
#add_library(server-shared STATIC ${SERVER_SRC})
11161116

11171117
# Target
1118-
add_executable(Server
1118+
add_executable(game-server
11191119
src/game/server/main_server.cpp
11201120
${DEPS}
11211121
${SERVER_SRC}
11221122
${SERVER_ICON}
11231123
)
11241124

1125-
set_property(TARGET Server
1125+
set_property(TARGET game-server
11261126
PROPERTY OUTPUT_NAME ${SERVER_EXECUTABLE}
11271127
)
11281128

1129-
list(APPEND TARGETS_OWN Server)
1129+
list(APPEND TARGETS_OWN game-server)
11301130

11311131
if(GEOLOCATION)
11321132
add_library(GeoLite2PP STATIC
@@ -1141,27 +1141,27 @@ if(GEOLOCATION)
11411141
)
11421142
add_library(GeoLite2PP::GeoLite2PP ALIAS GeoLite2PP)
11431143

1144-
target_sources(Server PRIVATE
1144+
target_sources(game-server PRIVATE
11451145
"src/infclassr/geolocation.cpp"
11461146
"src/infclassr/geolocation.h"
11471147
)
11481148

1149-
target_compile_definitions(Server PRIVATE CONF_GEOLOCATION)
1150-
target_link_libraries(Server
1149+
target_compile_definitions(game-server PRIVATE CONF_GEOLOCATION)
1150+
target_link_libraries(game-server
11511151
GeoLite2PP::GeoLite2PP
11521152
MaxMindDB::MaxMindDB
11531153
)
11541154
endif()
11551155

1156-
target_link_libraries(Server ${LIBS_SERVER})
1157-
list(APPEND TARGETS_OWN Server)
1158-
list(APPEND TARGETS_LINK Server)
1156+
target_link_libraries(game-server ${LIBS_SERVER})
1157+
list(APPEND TARGETS_OWN game-server)
1158+
list(APPEND TARGETS_LINK game-server)
11591159

1160-
target_link_libraries(Server engine-gfx)
1161-
target_link_libraries(Server engine-shared)
1162-
target_link_libraries(Server game-shared)
1163-
target_link_libraries(Server ICU::i18n)
1164-
target_link_libraries(Server ICU::uc)
1160+
target_link_libraries(game-server engine-gfx)
1161+
target_link_libraries(game-server engine-shared)
1162+
target_link_libraries(game-server game-shared)
1163+
target_link_libraries(game-server ICU::i18n)
1164+
target_link_libraries(game-server ICU::uc)
11651165

11661166
if(TARGET_OS AND TARGET_OS STREQUAL "mac")
11671167
set(SERVER_LAUNCHER_SRC src/osxlaunch/server.mm)
@@ -1210,7 +1210,7 @@ install(
12101210
)
12111211
install(
12121212
TARGETS
1213-
Server
1213+
game-server
12141214
DESTINATION
12151215
"."
12161216
)

0 commit comments

Comments
 (0)