diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/modules/CPackInstallConfig.cmake | 2 | ||||
| -rw-r--r-- | cmake/tools/CMakeLists.txt | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index fda69a64..696ba7e3 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -521,7 +521,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 ddaafa0f..04dc2ef6 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) set(LAUNCH_HELPER_SOURCES ${XML_SOURCES} diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 9beea5d3..dfc4842d 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -304,7 +304,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 74b66898..46e8fb6d 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 6a2e999d..8b3de0c9 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) |