Reactivate COMPILE_WITH_UNITY_CMAKE_SUPPORT

CMakeLists.txt

@@ -152,7 +152,7 @@ if(BUILD_TESTING)
    set(BUILD_TOOLS TRUE)
 endif()
 
-#REACTIVATE IT option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE)
+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)
@@ -160,6 +160,7 @@ if (USE_UNITY_CMAKE_SUPPORT)
         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)
+	add_definitions(-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT)
     endif()
 endif()
 set(SMI_MIN_VERSION "1.3")

src/core/CMakeLists.txt

@@ -295,9 +295,9 @@ ecm_qt_declare_logging_category(akonadicore_SRCS HEADER akonadicore_debug.h IDEN
 
 
 add_library(KF5AkonadiCore ${akonadicore_SRCS})
-if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
-    set_target_properties(KF5AkonadiCore PROPERTIES UNITY_BUILD ON)
-endif()
+#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+#    set_target_properties(KF5AkonadiCore PROPERTIES UNITY_BUILD ON)
+#endif()
 
 generate_export_header(KF5AkonadiCore BASE_NAME akonadicore)
 

src/server/CMakeLists.txt

@@ -167,9 +167,10 @@ qt5_add_dbus_interface(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interface
 qt5_add_resources(libakonadiserver_SRCS storage/akonadidb.qrc)
 
 add_library(libakonadiserver STATIC ${libakonadiserver_SRCS})
-if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
-    set_target_properties(libakonadiserver PROPERTIES UNITY_BUILD ON)
-endif()
+#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+#    set_target_properties(libakonadiserver PROPERTIES UNITY_BUILD ON)
+#    set_source_files_properties(storage/itemretrievalmanager.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+#endif()
 
 set_target_properties(libakonadiserver PROPERTIES OUTPUT_NAME akonadiserver)
 target_link_libraries(libakonadiserver