diff options
| author | mvglasow <michael -at- vonglasow.com> | 2018-05-26 23:04:26 +0200 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2018-05-26 23:04:26 +0200 |
| commit | cff4b0cbc8f1d761dcf5c96f3d897bca725ef242 (patch) | |
| tree | ed6297d9293c35bb1e8acb115bd4b404804fe3bf /navit/binding | |
| parent | 5b9d018fdbcef2b9ffaf539ee0f959bd07ccf57c (diff) | |
| parent | 2a103031eb73c1180287a176e7e9d2e006729329 (diff) | |
| download | navit-cff4b0cbc8f1d761dcf5c96f3d897bca725ef242.tar.gz | |
Merge branch 'master' into traffic
# Conflicts:
# CMakeLists.txt
# man/CMakeLists.txt
# navit/CMakeLists.txt
# navit/android/CMakeLists.txt
# navit/binding/dbus/binding_dbus.c
# navit/fonts/CMakeLists.txt
# navit/gui/internal/gui_internal_html.c
# navit/icons/CMakeLists.txt
# navit/item.c
# navit/navit.c
# navit/route.c
# navit/start_real.c
# navit/util.c
# navit/xmlconfig.c
# po/CMakeLists.txt
Diffstat (limited to 'navit/binding')
| -rw-r--r-- | navit/binding/dbus/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | navit/binding/win32/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/navit/binding/dbus/CMakeLists.txt b/navit/binding/dbus/CMakeLists.txt index ad6858346..b6378da14 100644 --- a/navit/binding/dbus/CMakeLists.txt +++ b/navit/binding/dbus/CMakeLists.txt @@ -2,9 +2,9 @@ module_add_library(binding_dbus binding_dbus.c) set(bindir ${CMAKE_INSTALL_PREFIX}/${BIN_DIR}) configure_file ( - "${CMAKE_CURRENT_SOURCE_DIR}/org.navit_project.navit.service.in" - "${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service" -) + "${CMAKE_CURRENT_SOURCE_DIR}/org.navit_project.navit.service.in" + "${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service" + ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/) diff --git a/navit/binding/win32/CMakeLists.txt b/navit/binding/win32/CMakeLists.txt index 710a4dcf6..37b675873 100644 --- a/navit/binding/win32/CMakeLists.txt +++ b/navit/binding/win32/CMakeLists.txt @@ -1,5 +1,5 @@ if (USE_LIBGNUINTL AND NOT HAVE_GLIB) - ADD_DEPENDENCIES(support_glib intl_cmake) + ADD_DEPENDENCIES(support_glib intl_cmake) endif() module_add_library(binding_win32 binding_win32.c) |