Use cmake --install for deployment

Author: tmp64

CMakeLists.txt

@@ -310,31 +310,19 @@ endfunction()
 # Autodeploy macro
 #-----------------------------------------------------------------
 if( AUTO_DEPLOY )
-	macro( add_auto_deploy TARGET_NAME PUBLISH_PATHS_FILE )
-		if( CMAKE_CXX_LINKER_SUPPORTS_PDB )
-			add_custom_command( TARGET ${TARGET_NAME}
-				POST_BUILD
-				COMMAND
-					${CMAKE_COMMAND}
-					-P
-					${CMAKE_SOURCE_DIR}/cmake/DeployLibs.cmake
-					--
-					${CMAKE_BINARY_DIR}/${PUBLISH_PATHS_FILE}
-					$<TARGET_FILE:${TARGET_NAME}>
-					$<TARGET_PDB_FILE:${TARGET_NAME}>
-			)
-		else()
-			add_custom_command( TARGET ${TARGET_NAME}
-				POST_BUILD
-				COMMAND
-					${CMAKE_COMMAND}
-					-P
-					${CMAKE_SOURCE_DIR}/cmake/DeployLibs.cmake
-					--
-					${CMAKE_BINARY_DIR}/${PUBLISH_PATHS_FILE}
-					$<TARGET_FILE:${TARGET_NAME}>
-			)
-		endif()
+	macro( add_auto_deploy target_name component_name publish_paths_file )
+		add_custom_command( TARGET ${target_name}
+			POST_BUILD
+			COMMAND
+				${CMAKE_COMMAND}
+				-P
+				${CMAKE_SOURCE_DIR}/cmake/DeployLibs.cmake
+				--
+				${CMAKE_BINARY_DIR}
+				${component_name}
+				"$<CONFIG>"
+				${CMAKE_BINARY_DIR}/${publish_paths_file}
+		)
 	endmacro()
 else()
 	macro( add_auto_deploy )

cmake/DeployLibs.cmake

@@ -14,12 +14,37 @@ foreach( i RANGE 0 ${last_arg_idx})
 	endif()
 endforeach()
 
-set( path_list_file ${CMAKE_ARGV${actual_args_start_idx}} )
+# Copy args to temp vars
+math( EXPR arg_binary_dir_idx "${actual_args_start_idx} + 0" )
+set( binary_dir ${CMAKE_ARGV${arg_binary_dir_idx}} )
+
+math( EXPR arg_component_idx "${actual_args_start_idx} + 1" )
+set( component_name ${CMAKE_ARGV${arg_component_idx}} )
+
+math( EXPR arg_config_idx "${actual_args_start_idx} + 2" )
+set( config_name ${CMAKE_ARGV${arg_component_idx}} )
+
+math( EXPR arg_path_list_idx "${actual_args_start_idx} + 3" )
+set( path_list_file ${CMAKE_ARGV${arg_path_list_idx}} )
+
+# Check that args are set
+if( NOT binary_dir )
+	message( FATAL_ERROR "Binary dir path not specified." )
+endif()
+
+if( NOT component_name )
+	message( FATAL_ERROR "Component name not specified." )
+endif()
 
 if( NOT path_list_file )
 	message( FATAL_ERROR "Path list file not specified." )
 endif()
 
+# Check that paths exist
+if( NOT EXISTS "${binary_dir}" )
+	message( FATAL_ERROR "Binary dir ${FATAL_ERROR} doesn't exist." )
+endif()
+
 if( NOT EXISTS "${path_list_file}" )
 	message( NOTICE "No deployment path specified. Create file ${path_list_file} with folder paths on separate lines for auto deployment." )
 	return()
@@ -30,17 +55,25 @@ file( STRINGS ${path_list_file} deploy_paths )
 
 # Iterate over all paths in the file
 foreach( deploy_path IN LISTS deploy_paths)
-	# Convert to full path
-	file( REAL_PATH ${deploy_path} deploy_path_full )
-
-	# Iterate over all files to copy
-	math( EXPR path_arg_start "${actual_args_start_idx} + 1" )
-	foreach( i RANGE ${path_arg_start} ${last_arg_idx})
-		file( REAL_PATH "${CMAKE_ARGV${i}}" file_to_copy )
-		message(STATUS "${file_to_copy} -> ${deploy_path}")
-		file(
-			COPY ${file_to_copy}
-			DESTINATION ${deploy_path_full}
-		)
-	endforeach()
+	cmake_path( IS_ABSOLUTE deploy_path is_path_absolute )
+
+	if( NOT is_path_absolute )
+		message( SEND_ERROR "Path must be absolute: ${deploy_path_full}" )
+		continue()
+	endif()
+
+	if( NOT EXISTS "${deploy_path}" )
+		message( SEND_ERROR "Path doesn't exist: ${deploy_path}" )
+		continue()
+	endif()
+
+	# Run cmake --install for the path
+	execute_process(
+		COMMAND
+			${CMAKE_COMMAND}
+			--install ${binary_dir}
+			--config "${config_name}"
+			--component ${component_name}
+			--prefix ${deploy_path}
+	)
 endforeach()

src/bugfixedapi_amxx/CMakeLists.txt

@@ -21,7 +21,7 @@ set( SOURCE_FILES
 source_group( TREE ${PROJECT_SOURCE_DIR} FILES ${SOURCE_FILES} )
 
 add_library( bugfixedapi_amxx SHARED ${SOURCE_FILES} )
-add_auto_deploy( bugfixedapi_amxx PublishPathAMXX.txt )
+add_auto_deploy( bugfixedapi_amxx server PublishPathServer.txt )
 bhl_version_info( bugfixedapi_amxx "bugfixedapi_amxx.dll" "BugfixedHL-Rebased AMXX Module" )
 
 target_include_directories( bugfixedapi_amxx PRIVATE

src/game/client/CMakeLists.txt

@@ -297,7 +297,7 @@ endif()
 source_group( TREE ${PROJECT_SOURCE_DIR} FILES ${SOURCE_FILES} )
 
 add_library( client SHARED ${SOURCE_FILES} )
-add_auto_deploy( client PublishPathClient.txt )
+add_auto_deploy( client client PublishPathClient.txt )
 bhl_version_info( client "client.dll" "BugfixedHL-Rebased Client" )
 
 target_include_directories( client PRIVATE

src/game/server/CMakeLists.txt

@@ -165,7 +165,7 @@ endif()
 source_group( TREE ${PROJECT_SOURCE_DIR} FILES ${SOURCE_FILES} )
 
 add_library( hl SHARED ${SOURCE_FILES} )
-add_auto_deploy( hl PublishPathServer.txt )
+add_auto_deploy( hl server PublishPathServer.txt )
 bhl_version_info( hl "hl.dll" "BugfixedHL-Rebased Server" )
 
 target_include_directories( hl PRIVATE