Don't update kcoreaddons helper headers on every reconfigure

Hshawn4 · Oct 3, 2022 · e8bc7cf · e8bc7cf
1 parent 6f96a68
commit e8bc7cf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/external/kcoreaddons/CMakeLists.txt b/external/kcoreaddons/CMakeLists.txt
@@ -62,19 +62,6 @@ if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     )
 endif()
 
-file(TOUCH
-    ${CMAKE_CURRENT_BINARY_DIR}/config-util.h
-    ${CMAKE_CURRENT_BINARY_DIR}/config-kdirwatch.h
-)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/include/kcoreaddons_export.h
-    "#define KCOREADDONS_ENABLE_DEPRECATED_SINCE(major, minor) 0"
-)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_debug.h
-    "#pragma once\n#include <QLoggingCategory>\nstatic const QLoggingCategory KCOREADDONS_DEBUG(\"kf.coreaddons\");"
-)
-
 target_compile_definitions(external_kcoreaddons
 PUBLIC
     KCOREADDONS_EXPORT=
@@ -86,8 +73,9 @@ target_include_directories(external_kcoreaddons SYSTEM
 PUBLIC
     ${kcoreaddons_src}/io
     ${kcoreaddons_src}/util
-    ${CMAKE_CURRENT_BINARY_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/headers/public
 PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/headers/private
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 

diff --git a/external/kcoreaddons/headers/private/config-kdirwatch.h b/external/kcoreaddons/headers/private/config-kdirwatch.h
diff --git a/external/kcoreaddons/headers/private/config-util.h b/external/kcoreaddons/headers/private/config-util.h
diff --git a/external/kcoreaddons/headers/private/kcoreaddons_debug.h b/external/kcoreaddons/headers/private/kcoreaddons_debug.h
@@ -0,0 +1,3 @@
+#pragma once
+#include <QLoggingCategory>
+static const QLoggingCategory KCOREADDONS_DEBUG("kf.coreaddons");
diff --git a/external/kcoreaddons/headers/public/kcoreaddons_export.h b/external/kcoreaddons/headers/public/kcoreaddons_export.h
@@ -0,0 +1 @@
+#define KCOREADDONS_ENABLE_DEPRECATED_SINCE(major, minor) 0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#define KCOREADDONS_ENABLE_DEPRECATED_SINCE(major, minor) 0