Attachment 129212 Details for Bug 99586 – Replace deprecated cmake install_ functions with related install(...) calls.

[patch] Replace deprecated cmake install_ functions with related install(...) calls.

Replace-deprecated-cmake-install-functions-with-re.patch (text/plain), 5.43 KB, created by Ralf Habacker on 2017-01-29 09:25:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-01-29 09:25:58 UTC

Size: 5.43 KB

patch

obsolete

>From 86085a7bf070d4dfc98d1ee080d6ca8c41c86ba3 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Sun, 15 May 2016 02:08:58 +0200
>Subject: [PATCH] Replace deprecated cmake install_ functions with related
> install(...) calls.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586
>---
> cmake/CMakeLists.txt                   |  2 +-
> cmake/bus/CMakeLists.txt               |  6 +++---
> cmake/dbus/CMakeLists.txt              |  2 +-
> cmake/modules/CPackInstallConfig.cmake |  2 +-
> cmake/tools/CMakeLists.txt             | 10 +++++-----
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index c1da993..18b98d6 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -537,7 +537,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY
> 
> if (WIN32)
> configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-env.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-env.bat )
>-install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat)
>+    install(FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat DESTINATION bin)
> endif()
> 
> add_definitions(-DHAVE_CONFIG_H=1)
>diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
>index 0dcae65..1c78e86 100644
>--- a/cmake/bus/CMakeLists.txt
>+++ b/cmake/bus/CMakeLists.txt
>@@ -94,7 +94,7 @@ target_link_libraries(dbus-daemon ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
> set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME})
> set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
> 
>-install_targets(/bin dbus-daemon)
>+install(TARGETS dbus-daemon ${INSTALL_TARGETS_DEFAULT_ARGS})
> install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION share/dbus-1)
> install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf DESTINATION etc/dbus-1)
> install(DIRECTORY DESTINATION share/dbus-1/session.d)
>@@ -119,7 +119,7 @@ if (DBUS_SERVICE)
> 	add_executable(dbus-service ${dbus_service_SOURCES} )
> 	target_link_libraries(dbus-service ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
> 	set_target_properties(dbus-service PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
>-	install_targets(/bin dbus-service )
>+	install(TARGETS dbus-service ${INSTALL_TARGETS_DEFAULT_ARGS})
> endif (DBUS_SERVICE)
> 
> if (DBUS_ENABLE_EMBEDDED_TESTS)
>@@ -175,7 +175,7 @@ if(NOT WIN32)
>    set (SOURCES ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/test-launch-helper.c)
>    add_test_executable(test-bus-launch-helper "${SOURCES}"  ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
>    set_target_properties(test-bus-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
>-   install_targets(/lib dbus-daemon-launch-helper)
>+   install(TARGETS dbus-daemon-launch-helper ${INSTALL_TARGETS_DEFAULT_ARGS})
> endif(NOT WIN32)
> 
> #### Init scripts fun
>diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
>index f38f79f..4c12125 100644
>--- a/cmake/dbus/CMakeLists.txt
>+++ b/cmake/dbus/CMakeLists.txt
>@@ -293,7 +293,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
> endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
> 
> install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
>-install_files(/include/dbus FILES ${dbusinclude_HEADERS})
>+install(FILES ${dbusinclude_HEADERS} DESTINATION include/dbus)
> 
> ### Internal library, used for the daemon, tools and tests, compiled statically.
> 
>diff --git a/cmake/modules/CPackInstallConfig.cmake b/cmake/modules/CPackInstallConfig.cmake
>index 74b6689..b23daf9 100644
>--- a/cmake/modules/CPackInstallConfig.cmake
>+++ b/cmake/modules/CPackInstallConfig.cmake
>@@ -1,10 +1,10 @@
> 
> if (DBUS_INSTALL_SYSTEM_LIBS)
> 	if (MINGW)
>-		install_files(/bin FILES ${LIBEXPAT_LIBRARIES})
> 	else (MINGW)
> 		INCLUDE(InstallRequiredSystemLibraries)
> 	endif (MINGW)
>+        install(FILES ${LIBEXPAT_LIBRARIES} DESTINATION bin)
> endif (DBUS_INSTALL_SYSTEM_LIBS)
> 
> SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D-BUS For Windows")
>diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt
>index 6a2e999..8b3de0c 100644
>--- a/cmake/tools/CMakeLists.txt
>+++ b/cmake/tools/CMakeLists.txt
>@@ -56,26 +56,26 @@ set (dbus_cleanup_sockets_SOURCES
> 
> add_executable(dbus-send ${dbus_send_SOURCES})
> target_link_libraries(dbus-send ${DBUS_LIBRARIES})
>-install_targets(/bin dbus-send )
>+install(TARGETS dbus-send ${INSTALL_TARGETS_DEFAULT_ARGS})
> 
> add_executable(dbus-test-tool ${dbus_test_tool_SOURCES})
> target_link_libraries(dbus-test-tool ${DBUS_LIBRARIES})
>-install_targets(/bin dbus-test-tool )
>+install(TARGETS dbus-test-tool ${INSTALL_TARGETS_DEFAULT_ARGS})
> 
> add_executable(dbus-update-activation-environment ${dbus_update_activation_environment_SOURCES})
> target_link_libraries(dbus-update-activation-environment ${DBUS_LIBRARIES})
>-install_targets(/bin dbus-update-activation-environment )
>+install(TARGETS dbus-update-activation-environment ${INSTALL_TARGETS_DEFAULT_ARGS})
> 
> add_executable(dbus-launch ${dbus_launch_SOURCES})
> target_link_libraries(dbus-launch ${DBUS_LIBRARIES})
> if (DBUS_BUILD_X11)
>   target_link_libraries(dbus-launch ${X11_LIBRARIES} )
> endif (DBUS_BUILD_X11)
>-install_targets(/bin dbus-launch )
>+install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS})
> 
> add_executable(dbus-monitor ${dbus_monitor_SOURCES})
> target_link_libraries(dbus-monitor ${DBUS_LIBRARIES})
>-install_targets(/bin dbus-monitor )
>+install(TARGETS dbus-monitor ${INSTALL_TARGETS_DEFAULT_ARGS})
> 
> # create the /var/lib/dbus directory for dbus-uuidgen
> install(DIRECTORY DESTINATION var/lib/dbus)
>-- 
>2.6.6

Actions: View | Splinter Review

Attachments on bug 99586: 129211 | 129212 | 129213 | 129214 | 129215 | 129235 | 129236

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.