Reactivate UNITY cmake support

CMakeLists.txt

@@ -146,17 +146,16 @@ endif()
 add_definitions(-DQT_NO_EMIT)
 
 kde_enable_exceptions()
-#Laurent: disable for the moment
-#option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE)
-
-#set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false)
-#if (USE_UNITY_CMAKE_SUPPORT)
-#    if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
-#        message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support")
-#    else()
-#        set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true)
-#    endif()
-#endif()
+option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE)
+
+set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false)
+if (USE_UNITY_CMAKE_SUPPORT)
+    if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
+        message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support")
+    else()
+        set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true)
+    endif()
+endif()
 
 add_subdirectory(pics)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -332,9 +332,9 @@ ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})
 qt5_add_resources(_kleopatra_SRCS kleopatra.qrc)
 
 add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_uiserver_SRCS})
-if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
-    set_target_properties(kleopatra_bin PROPERTIES UNITY_BUILD ON)
-endif()
+#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+#    set_target_properties(kleopatra_bin PROPERTIES UNITY_BUILD ON)
+#endif()
 set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)
 
 if (WIN32)

src/conf/CMakeLists.txt

@@ -69,7 +69,9 @@ target_link_libraries(kcm_kleopatra
   ${_kleopatra_dbusaddons_libs}
   ${_kcm_kleopatra_libkleopatraclient_extra_LIBS}
 )
-
+if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+    set_target_properties(kcm_kleopatra PROPERTIES UNITY_BUILD ON)
+endif()
 install(TARGETS kcm_kleopatra DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 ########### install files ###############