Merge branch 'Applications/15.08'

Conflicts:
	CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1db40d13bb1f66f83840942eb990914ea6a99080..6a4c49bcfc3c61cc5283d40df0e47e11d8392df3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,17 +25,13 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings)
 
-ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
-                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
-)
-
-ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS
+ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
                   SOVERSION 5
 )
 
-ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
+ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
                   SOVERSION 5
 )
 

diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake
index 0fd2f4c1fb72ad3c87b5683f72cf7b52454fa883..71ad9067d992d1cb41bcdc0ea0f8dc3328729794 100644 (file)
--- a/cmake/DbusInterfaceMacros.cmake
+++ b/cmake/DbusInterfaceMacros.cmake
@@ -4,7 +4,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
         ${output_xml_file}
     )
     add_custom_target(
-        ${output_xml_file}
+        ${output_xml_file}_target
         SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
        )
     install(
@@ -13,6 +13,6 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
     )
     add_dependencies(
         ${main_project_target}
-        ${output_xml_file}
+        ${output_xml_file}_target
     )
 endmacro ()