Turn filelists to proper cmake files and include() them for proper ch…

…ange detection
legacyclonk · Dec 8, 2024 · fc5eff5 · fc5eff5
1 parent 8edc3ef
commit fc5eff5
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,8 +147,8 @@ endif ()
 
 # Adds the lines of file LIST_FILE to variable TARGET_LIST
 function(append_filelist TARGET_LIST LIST_FILE)
-	file(STRINGS "cmake/filelists/${LIST_FILE}" FILE_CONTENTS)
-	list(APPEND ${TARGET_LIST} ${FILE_CONTENTS})
+	include("cmake/filelists/${LIST_FILE}.cmake")
+	list(APPEND ${TARGET_LIST} ${FILE_LIST})
 	set(${TARGET_LIST} "${${TARGET_LIST}}" PARENT_SCOPE)
 endfunction()
 
@@ -174,7 +174,7 @@ endfunction()
 
 # Add engine target
 
-append_filelist(CLONK_SOURCES Engine.txt)
+append_filelist(CLONK_SOURCES Engine)
 
 set(LICENSES
 	"COPYING@LegacyClonk@ISC"
@@ -206,25 +206,25 @@ if (ENABLE_SOUND)
 endif ()
 
 if (WIN32)
-	append_filelist(CLONK_SOURCES EngineWin32.txt)
+	append_filelist(CLONK_SOURCES EngineWin32)
 else ()
 	if (APPLE)
-		append_filelist(CLONK_SOURCES EngineApple.txt)
+		append_filelist(CLONK_SOURCES EngineApple)
 	endif ()
 
 	list(APPEND CLONK_SOURCES src/StdAppUnix.cpp)
 endif ()
 
 if (USE_SDL_MAINLOOP OR USE_SDL_MIXER)
-	append_filelist(CLONK_SOURCES EngineSdl.txt)
+	append_filelist(CLONK_SOURCES EngineSdl)
 endif ()
 
 if (USE_SDL_MAINLOOP)
-	append_filelist(CLONK_SOURCES EngineSdlMainloop.txt)
+	append_filelist(CLONK_SOURCES EngineSdlMainloop)
 endif ()
 
 if (USE_X11)
-	append_filelist(CLONK_SOURCES EngineX.txt)
+	append_filelist(CLONK_SOURCES EngineX)
 endif ()
 
 if (USE_WIC)
@@ -236,11 +236,11 @@ else ()
 endif ()
 
 if (WITH_DEVELOPER_MODE)
-	append_filelist(CLONK_SOURCES EngineGtk.txt)
+	append_filelist(CLONK_SOURCES EngineGtk)
 endif ()
 
 if (USE_CONSOLE AND NOT WIN32)
-	append_filelist(CLONK_SOURCES EngineConsoleNonWin32.txt)
+	append_filelist(CLONK_SOURCES EngineConsoleNonWin32)
 endif ()
 
 if (USE_LIBNOTIFY)
@@ -287,15 +287,15 @@ target_sources(clonk PUBLIC ${RES_STR_TABLE_OUTPUT_CPP} ${RES_STR_TABLE_OUTPUT_H
 
 # Add c4group target
 
-append_filelist(C4GROUP_SOURCES C4Group.txt)
+append_filelist(C4GROUP_SOURCES C4Group)
 
 add_executable(c4group ${C4GROUP_SOURCES})
 target_link_libraries(c4group standard)
 target_compile_definitions(c4group PRIVATE USE_CONSOLE)
 
 # Add libstandard target
 
-append_filelist(LIBSTANDARD_SOURCES Std.txt)
+append_filelist(LIBSTANDARD_SOURCES Std)
 
 if (WIN32)
 	list(APPEND LIBSTANDARD_SOURCES src/StdRegistry.cpp src/StdRegistry.h)
@@ -624,8 +624,8 @@ function(set_up_pch TARGET)
 		endforeach()
 	endforeach()
 	# Don't precompile certain headers
-	file(STRINGS "cmake/filelists/PchExclude.txt" PCH_EXCLUDE)
-	list(REMOVE_ITEM PCH_LIST ${PCH_EXCLUDE})
+	include("cmake/filelists/PchExclude.cmake")
+	list(REMOVE_ITEM PCH_LIST ${FILE_LIST})
 	# Include headers of external libraries
 	list(APPEND PCH_LIST ${PCH_EXTRA})
 	# Clean up PCH list

diff --git a/cmake/filelists/C4Group.txt → cmake/filelists/C4Group.cmake b/cmake/filelists/C4Group.txt → cmake/filelists/C4Group.cmake
@@ -1,3 +1,4 @@
+set(FILE_LIST
 src/C4Config.cpp
 src/C4Group.cpp
 src/C4Group.h
@@ -7,3 +8,4 @@ src/C4Update.cpp
 src/C4Update.h
 src/C4Version.h
 src/c4group_ng.cpp
+)
diff --git a/cmake/filelists/Engine.txt → cmake/filelists/Engine.cmake b/cmake/filelists/Engine.txt → cmake/filelists/Engine.cmake
@@ -1,3 +1,4 @@
+set(FILE_LIST
 src/Bitmap256.cpp
 src/Bitmap256.h
 src/C4Action.cpp
@@ -362,3 +363,4 @@ src/StdSurface8.h
 src/StdSync.cpp
 src/StdSync.h
 src/StdWindow.h
+)
diff --git a/cmake/filelists/EngineApple.txt → cmake/filelists/EngineApple.cmake b/cmake/filelists/EngineApple.txt → cmake/filelists/EngineApple.cmake
@@ -1,3 +1,5 @@
+set(FILE_LIST
 src/MacAppTranslocation.h
 src/MacAppTranslocation.cpp
 src/MacUtility.mm
+)
diff --git a/cmake/filelists/EngineX.txt → cmake/filelists/EngineConsoleNonWin32.cmake b/cmake/filelists/EngineX.txt → cmake/filelists/EngineConsoleNonWin32.cmake
@@ -1 +1,3 @@
+set(FILE_LIST
 src/StdXWindow.cpp
+)
diff --git a/cmake/filelists/EngineGtk.txt → cmake/filelists/EngineGtk.cmake b/cmake/filelists/EngineGtk.txt → cmake/filelists/EngineGtk.cmake
@@ -1,2 +1,4 @@
+set(FILE_LIST
 src/StdGtkWindow.cpp
 src/StdGtkWindow.h
+)
diff --git a/cmake/filelists/EngineSdl.txt → cmake/filelists/EngineSdl.cmake b/cmake/filelists/EngineSdl.txt → cmake/filelists/EngineSdl.cmake
@@ -1,2 +1,4 @@
+set(FILE_LIST
 src/StdSdlSubSystem.cpp
 src/StdSdlSubSystem.h
+)
diff --git a/cmake/filelists/EngineSdlMainloop.txt → cmake/filelists/EngineSdlMainloop.cmake b/cmake/filelists/EngineSdlMainloop.txt → cmake/filelists/EngineSdlMainloop.cmake
@@ -1 +1,3 @@
+set(FILE_LIST
 src/StdSDLWindow.cpp
+)
diff --git a/cmake/filelists/EngineWin32.txt → cmake/filelists/EngineWin32.cmake b/cmake/filelists/EngineWin32.txt → cmake/filelists/EngineWin32.cmake
@@ -1,3 +1,4 @@
+set(FILE_LIST
 src/C4Com.h
 src/C4CrashHandlerWin32.cpp
 src/C4FileClasses.cpp
@@ -10,3 +11,4 @@ src/StdAppWin32.cpp
 src/StdStringEncodingConverter.cpp
 src/StdStringEncodingConverter.h
 src/StdWindow.cpp
+)
diff --git a/cmake/filelists/EngineConsoleNonWin32.txt → cmake/filelists/EngineX.cmake b/cmake/filelists/EngineConsoleNonWin32.txt → cmake/filelists/EngineX.cmake
@@ -1 +1,3 @@
+set(FILE_LIST
 src/StdXWindow.cpp
+)
diff --git a/cmake/filelists/PchExclude.txt → cmake/filelists/PchExclude.cmake b/cmake/filelists/PchExclude.txt → cmake/filelists/PchExclude.cmake
@@ -1,6 +1,8 @@
+set(FILE_LIST
 src/C4AudioSystemFmodRuntime.h
 src/C4AudioSystemNone.h
 src/C4AudioSystemSdl.h
 src/C4ToastLibNotify.h
 src/C4ToastWinToastLib.h
 src/StdWic.h
+)
diff --git a/cmake/filelists/Std.txt → cmake/filelists/Std.cmake b/cmake/filelists/Std.txt → cmake/filelists/Std.cmake
@@ -1,3 +1,4 @@
+set(FILE_LIST
 src/C4Attributes.h
 src/C4Breakpoint.h
 src/C4Chrono.cpp
@@ -22,3 +23,4 @@ src/StdGzCompressedFile.cpp
 src/StdGzCompressedFile.h
 src/StdHelpers.h
 src/StdSha1.h
+)