Rename server target

Author: tmp64

gamedir/CMakeLists.txt

@@ -426,5 +426,5 @@ add_dependencies( client convert_utf_files_client )
 
 # Server
 bhl_install_files( server "${SERVER_FILES}" )
-bhl_install_target( server hl "dlls" )
+bhl_install_target( server server "dlls" )
 bhl_install_target( server bugfixedapi_amxx "addons/amxmodx/modules" )

src/game/server/CMakeLists.txt

@@ -1,3 +1,5 @@
+set( TARGET_NAME server )
+
 set( SOURCE_FILES
 	${GAME_COMMON_SRCS}
 	CMakeLists.txt
@@ -164,25 +166,25 @@ endif()
 
 source_group( TREE ${PROJECT_SOURCE_DIR} FILES ${SOURCE_FILES} )
 
-add_library( hl SHARED ${SOURCE_FILES} )
-add_auto_deploy( hl server PublishPathServer.txt )
-bhl_version_info( hl "hl.dll" "BugfixedHL-Rebased Server" )
+add_library( ${TARGET_NAME} SHARED ${SOURCE_FILES} )
+add_auto_deploy( ${TARGET_NAME} server PublishPathServer.txt )
+bhl_version_info( ${TARGET_NAME} "hl.dll" "BugfixedHL-Rebased Server" )
 
-target_include_directories( hl PRIVATE
+target_include_directories( ${TARGET_NAME} PRIVATE
 	.
 	${GAME_COMMON_INCLUDE_PATHS}
 	${SOURCE_SDK_INCLUDE_PATHS} # For mathlib
 )
 
-target_compile_definitions( hl PRIVATE
+target_compile_definitions( ${TARGET_NAME} PRIVATE
 	${GAME_COMMON_DEFINES}
 	${SOURCE_SDK_DEFINES}
 	SERVER_DLL
 	MATHLIB_USE_C_ASSERT
 	MATHLIB_VECTOR_NONTRIVIAL
 )
 
-target_precompile_headers( hl PRIVATE pch.h )
+target_precompile_headers( ${TARGET_NAME} PRIVATE pch.h )
 
 # Dependencies
 if( WIN32 )
@@ -194,7 +196,7 @@ else()
 endif()
 
 # Link with dependencies
-target_link_libraries( hl 
+target_link_libraries( ${TARGET_NAME} 
 	${SERVER_PLAT_LIBS}
 	semver
 	Threads::Threads
@@ -204,10 +206,13 @@ target_link_libraries( hl
 set( SERVER_LINK_FLAGS "")
 set( SERVER_COMPILE_FLAGS "")
 
-set_target_properties( hl PROPERTIES
+set_target_properties( ${TARGET_NAME} PROPERTIES
 	COMPILE_FLAGS "${SERVER_COMPILE_FLAGS}" 
 	LINK_FLAGS "${SHARED_GAME_LINKER_FLAGS} ${SERVER_LINK_FLAGS}"
 )
 
 # Remove "lib" prefix
-set_target_properties( hl PROPERTIES PREFIX "" )
+set_target_properties( ${TARGET_NAME} PROPERTIES PREFIX "" )
+
+# Set the original name
+set_target_properties( ${TARGET_NAME} PROPERTIES OUTPUT_NAME "hl" )

src/tests/CMakeLists.txt

@@ -72,7 +72,7 @@ if( BUILD_TESTING )
 		${TESTS_SERVER}
 	)
 
-	add_dependencies( test_server hl )
+	add_dependencies( test_server server )
 
 	target_include_directories( test_server PRIVATE
 		${CMAKE_CURRENT_SOURCE_DIR}/common
@@ -107,7 +107,7 @@ if( BUILD_TESTING )
 	)
 
 	add_test( NAME server
-		COMMAND test_server "$<TARGET_FILE:hl>"
+		COMMAND test_server "$<TARGET_FILE:server>"
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/workdir"
 	)