Reactivate compile with UNITY cmake support

CMakeLists.txt

@@ -142,17 +142,16 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 #add_definitions(-DQT_NO_FOREACH)
 #add_definitions(-DQT_NO_KEYWORDS)
 
-#Laurent reactivate it
-#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(src)
 add_subdirectory(korgac)

korgac/CMakeLists.txt

@@ -44,6 +44,9 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/*-apps-korgac.png")
 ecm_add_app_icon(korgac_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(korgac ${korgac_SRCS})
+if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+    set_target_properties(korgac PROPERTIES UNITY_BUILD ON)
+endif()
 if( APPLE )
     set_target_properties(korgac PROPERTIES
         MACOSX_BUNDLE_INFO_PLIST ${korganizer_SOURCE_DIR}/korgac/Info.plist.template

src/CMakeLists.txt

@@ -256,9 +256,9 @@ qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
     )
 
 add_library(korganizerprivate ${korganizerprivate_LIB_SRCS})
-if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
-    set_target_properties(korganizerprivate PROPERTIES UNITY_BUILD ON)
-endif()
+#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
+#    set_target_properties(korganizerprivate PROPERTIES UNITY_BUILD ON)
+#endif()
 
 generate_export_header(korganizerprivate BASE_NAME korganizerprivate)