Include header files in CMake sources (#16297)

src/CMakeLists.txt

@@ -445,8 +445,11 @@ set(independent_SRCS
 	${util_SRCS}
 )
 
+file(GLOB common_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 # /!\ Consider carefully before adding files here /!\
 set(common_SRCS
+	${common_HDRS}
 	clientdynamicinfo.cpp
 	collision.cpp
 	content_mapnode.cpp

src/benchmark/CMakeLists.txt

@@ -1,4 +1,6 @@
 set (BENCHMARK_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/benchmark.h
+
 	${CMAKE_CURRENT_SOURCE_DIR}/benchmark.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_activeobjectmgr.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_lighting.cpp

src/client/CMakeLists.txt

@@ -23,7 +23,10 @@ if(USE_SOUND)
 		PARENT_SCOPE)
 endif()
 
+file(GLOB_RECURSE client_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(client_SRCS
+	${client_HDRS}
 	${sound_SRCS}
 	${CMAKE_CURRENT_SOURCE_DIR}/meshgen/collector.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/render/anaglyph.cpp

src/content/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB content_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(content_SRCS
+	${content_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/content.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/mod_configuration.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp

src/database/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB database_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(database_SRCS
+	${database_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/database.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/database-dummy.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/database-files.cpp

src/gui/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB gui_HDRS "*.h")
+
 set(gui_SRCS
+	${gui_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/guiAnimatedImage.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiBackgroundImage.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiBox.cpp

src/irrlicht_changes/CMakeLists.txt

@@ -1,5 +1,8 @@
 if (BUILD_CLIENT)
+	file(GLOB client_irrlicht_changes_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 	set(client_irrlicht_changes_SRCS
+		${client_irrlicht_changes_HDRS}
 		${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/CGUITTFont.cpp
 	)

src/mapgen/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB mapgen_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(mapgen_SRCS
+	${mapgen_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/cavegen.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/dungeongen.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/mapgen_carpathian.cpp

src/network/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB_RECURSE common_network_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(common_network_SRCS
+	${common_network_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/address.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/connection.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/mtp/impl.cpp

src/script/CMakeLists.txt

@@ -3,9 +3,13 @@ add_subdirectory(cpp_api)
 add_subdirectory(lua_api)
 
 # Used by server and client
+file(GLOB common_SCRIPT_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(common_SCRIPT_SRCS
+	${common_SCRIPT_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_server.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_emerge.cpp
+
 	${common_SCRIPT_COMMON_SRCS}
 	${common_SCRIPT_CPP_API_SRCS}
 	${common_SCRIPT_LUA_API_SRCS}
@@ -16,6 +20,7 @@ set(client_SCRIPT_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_mainmenu.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_client.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_pause_menu.cpp
+
 	${client_SCRIPT_COMMON_SRCS}
 	${client_SCRIPT_CPP_API_SRCS}
 	${client_SCRIPT_LUA_API_SRCS}

src/script/common/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB common_SCRIPT_COMMON_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(common_SCRIPT_COMMON_SRCS
+	${common_SCRIPT_COMMON_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/c_content.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/c_converter.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/c_internal.cpp

src/script/cpp_api/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB common_SCRIPT_CPP_API_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(common_SCRIPT_CPP_API_SRCS
+	${common_SCRIPT_CPP_API_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/s_async.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_base.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_entity.cpp

src/script/lua_api/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB common_SCRIPT_LUA_API_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(common_SCRIPT_LUA_API_SRCS
+	${common_SCRIPT_LUA_API_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/l_areastore.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_auth.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_base.cpp

src/server/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB common_server_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(common_server_SRCS
+	${common_server_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/activeobjectmgr.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/ban.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/blockmodifier.cpp

src/threading/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB threading_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(threading_SRCS
+	${threading_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/thread.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/semaphore.cpp

src/unittest/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB unittest_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set (UNITTEST_SRCS
+	${unittest_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/test.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_address.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_authdatabase.cpp

src/util/CMakeLists.txt

@@ -1,4 +1,7 @@
+file(GLOB util_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
 set(util_SRCS
+	${util_HDRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp