Port away from ECMSetupVersion's deprecated *_VERSION_STRING CMake variable

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd3e771b7ae9a9ccfbe405781f922ae7c00daca3..137f01c36176f04d7e316dffffb437d8b819b93a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,11 +15,8 @@ add_definitions(
 )
 remove_definitions(
     -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_FOREACH
-    -DQT_NO_KEYWORDS
 )
 
 ##########################################
@@ -37,7 +34,7 @@ target_link_libraries(
 )
 
 set_target_properties(dolphinvcs PROPERTIES
-    VERSION ${DOLPHINVCS_VERSION_STRING}
+    VERSION ${DOLPHINVCS_VERSION}
     SOVERSION ${DOLPHINVCS_SOVERSION}
     EXPORT_NAME DolphinVcs
 )
@@ -129,7 +126,7 @@ if(HAVE_BALOO)
     )
 endif()
 
-kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS GENERATE_MOC
+kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
     settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
@@ -170,7 +167,7 @@ if(HAVE_BALOO)
 endif()
 
 set_target_properties(dolphinprivate PROPERTIES
-    VERSION ${DOLPHINPRIVATE_VERSION_STRING}
+    VERSION ${DOLPHINPRIVATE_VERSION}
     SOVERSION ${DOLPHINPRIVATE_SOVERSION}
 )
 
@@ -280,18 +277,20 @@ if(HAVE_KUSERFEEDBACK)
     )
 endif()
 
-kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC
+kconfig_add_kcfg_files(dolphinstatic_SRCS
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc
     settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
-    settings/dolphin_generalsettings.kcfgc
     settings/dolphin_contextmenusettings.kcfgc
     settings/dolphin_iconsmodesettings.kcfgc
     search/dolphin_searchsettings.kcfgc
     settings/dolphin_versioncontrolsettings.kcfgc
 )
+kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC
+    settings/dolphin_generalsettings.kcfgc
+)
 
 qt5_add_resources(dolphinstatic_SRCS dolphin.qrc)
 
@@ -336,12 +335,11 @@ set(dolphin_SRCS
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
 ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
 
-kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
-
+add_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(kdeinit_dolphin PUBLIC
-    dolphinprivate
+target_link_libraries(dolphin
     PRIVATE
+    dolphinprivate
     dolphinstatic
     KF5::Crash
 )
@@ -349,13 +347,12 @@ target_link_libraries(kdeinit_dolphin PUBLIC
 include(DbusInterfaceMacros)
 
 generate_and_install_dbus_interface(
-    kdeinit_dolphin
+    dolphin
     dbusinterface.h
     org.freedesktop.FileManager1.xml
     OPTIONS -a
 )
 
-install(TARGETS kdeinit_dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################