build(cmake): modernize build system and dependency management

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -61,7 +61,7 @@ jobs:
     runs-on: [self-hosted, windows]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -81,7 +81,7 @@ jobs:
     runs-on: [self-hosted, linux]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
 

.github/workflows/clang-format-check.yml

@@ -9,7 +9,7 @@ jobs:
         path:
           - 'Fronter/Source'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Run clang-format style check for C/C++ programs.
       uses: jidicula/clang-format-action@v4.16.0
       with:

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "external/wxWidgets"]
 	path = external/wxWidgets
 	url = https://github.com/ParadoxGameConverters/wxWidgets
-[submodule "external/commonItems"]
-	path = external/commonItems
-	url = https://github.com/ParadoxGameConverters/commonItems

CMakeLists.txt

@@ -1,61 +1,212 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.25)
 
 project(Fronter)
-set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/Fronter/Source)
-set(PROJECT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/Fronter/Source)
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Release)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++23")
-
-add_compile_options(-D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread -Wall -O2 -Wno-unused-variable)
-add_link_options(-no-pie)
-
-set(CURL_LIBRARY "-lcurl") 
-find_package(CURL REQUIRED) 
-include_directories(${CURL_INCLUDE_DIR})
-
-include_directories("external/commonItems")
-include_directories("external/commonItems/external/json/single_include")
-include_directories("external/SQLiteCpp/include")
-include_directories("external/SQLiteCpp/sqlite3")
-include_directories("/usr/include/wx-3.2-unofficial")
-include_directories("/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.2-unofficial")
-include_directories("${PROJECT_SOURCE_DIR}")
-
-file(GLOB MAIN_SOURCES "${PROJECT_SOURCE_DIR}/*.cpp")
-file(GLOB CONFIGURATION_SOURCES "${PROJECT_SOURCE_DIR}/Configuration/*.cpp")
-file(GLOB CONFIGURATION_OPTIONS_SOURCES "${PROJECT_SOURCE_DIR}/Configuration/Options/*.cpp")
-file(GLOB FRAMES_SOURCES "${PROJECT_SOURCE_DIR}/Frames/*.cpp")
-file(GLOB FRAMES_TABS_SOURCES "${PROJECT_SOURCE_DIR}/Frames/Tabs/*.cpp")
-file(GLOB UTILS_SOURCES "${PROJECT_SOURCE_DIR}/Utils/*.cpp")
-file(GLOB UTILS_LOCALIZATION_SOURCES "${PROJECT_SOURCE_DIR}/Utils/Localization/*.cpp")
-file(GLOB CONVERTERLAUNCHER_SOURCES "${PROJECT_SOURCE_DIR}/WorkerThreads/ConverterLauncher/*.cpp")
-list(REMOVE_ITEM CONVERTERLAUNCHER_SOURCES "${PROJECT_SOURCE_DIR}/WorkerThreads/ConverterLauncher/WinConverterLauncher.cpp")
-file(GLOB LOGWATCHER_SOURCES "${PROJECT_SOURCE_DIR}/WorkerThreads/LogWatcher/*.cpp")
-file(GLOB MODCOPIER_SOURCES "${PROJECT_SOURCE_DIR}/WorkerThreads/ModCopier/*.cpp")
-file(GLOB UPDATECHECKER_SOURCES "${PROJECT_SOURCE_DIR}/UpdateChecker/*.cpp")
-file(GLOB SQLITE_SOURCES "${PROJECT_SOURCE_DIR}/../../external/SQLiteCpp/src/*.cpp")
-
-add_subdirectory(external/commonItems EXCLUDE_FROM_ALL)
-add_subdirectory(external/SQLiteCpp/sqlite3 EXCLUDE_FROM_ALL)
-
-add_executable(ConverterFrontend
-	${MAIN_SOURCES}
-	${CONFIGURATION_SOURCES}
-	${CONFIGURATION_OPTIONS_SOURCES}
-	${FRAMES_SOURCES}
-	${FRAMES_TABS_SOURCES}
-	${UTILS_SOURCES}
-	${UTILS_LOCALIZATION_SOURCES}
-	${CONVERTERLAUNCHER_SOURCES}
-	${LOGWATCHER_SOURCES}
-	${MODCOPIER_SOURCES}
-	${UPDATECHECKER_SOURCES}
-	${SQLITE_SOURCES}
-)
-
-find_package(wxWidgets REQUIRED COMPONENTS net core base)
-include(${wxWidgets_USE_FILE})
-target_link_libraries(ConverterFrontend commonLib sqlite3 ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES})
-
-add_custom_command(TARGET ConverterFrontend POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND chmod u+x ./Copy_Files.sh)
-add_custom_command(TARGET ConverterFrontend POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ./Copy_Files.sh)
+
+# --- Project Configuration ---
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Set output directory for executables
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Release)
+
+# --- Platform Specific Flags ---
+if (MSVC)
+	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+	add_compile_definitions(UNICODE _UNICODE)
+elseif (UNIX)
+	add_compile_options(-pthread -Wall -O2 -Wno-unused-variable)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
+endif ()
+
+# --- Dependencies ---
+include(FetchContent)
+
+# 1. SQLiteCpp
+# Always fetch from source to avoid VCPKG DLL/Static mismatches
+message(STATUS "Fronter: Fetching SQLiteCpp from source...")
+set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "" FORCE)
+set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "" FORCE)
+set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+
+FetchContent_Declare(
+		SQLiteCpp
+		GIT_REPOSITORY https://github.com/SRombauts/SQLiteCpp.git
+		GIT_TAG 3.3.3
+		)
+FetchContent_MakeAvailable(SQLiteCpp)
+
+# Alias to ensure consistent naming
+if(TARGET SQLiteCpp AND NOT TARGET SQLiteCpp::SQLiteCpp)
+	add_library(SQLiteCpp::SQLiteCpp ALIAS SQLiteCpp)
+endif()
+
+# 2. CURL
+find_package(CURL 8.17.0 QUIET CONFIG)
+
+if (NOT CURL_FOUND)
+	find_package(CURL 8.17.0 QUIET)
+endif ()
+
+if (NOT CURL_FOUND)
+	find_package(PkgConfig QUIET)
+	pkg_check_modules(PC_CURL QUIET libcurl>=8.17.0)
+
+	if (PC_CURL_FOUND)
+		message(STATUS "Found libcurl via PkgConfig")
+		set(CURL_FOUND TRUE)
+		if (NOT TARGET CURL::libcurl)
+			add_library(CURL::libcurl INTERFACE IMPORTED)
+			target_include_directories(CURL::libcurl INTERFACE ${PC_CURL_INCLUDE_DIRS})
+			target_link_libraries(CURL::libcurl INTERFACE ${PC_CURL_LIBRARIES})
+			target_link_directories(CURL::libcurl INTERFACE ${PC_CURL_LIBRARY_DIRS})
+			target_compile_options(CURL::libcurl INTERFACE ${PC_CURL_CFLAGS_OTHER})
+			target_link_options(CURL::libcurl INTERFACE ${PC_CURL_LDFLAGS_OTHER})
+		endif ()
+	endif ()
+endif ()
+
+if (NOT CURL_FOUND)
+	message(STATUS "CURL not found installed, fetching from source...")
+	set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
+	set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
+	set(CURL_DISABLE_TESTS ON CACHE BOOL "" FORCE)
+
+	FetchContent_Declare(
+			CURL
+			GIT_REPOSITORY https://github.com/curl/curl.git
+			GIT_TAG curl-8_17_0
+			)
+	FetchContent_MakeAvailable(CURL)
+endif ()
+
+# 3. wxWidgets
+find_package(wxWidgets 3.2.0 QUIET COMPONENTS net core base)
+
+if (wxWidgets_FOUND)
+	if (TARGET wx::core)
+		set(WX_LIBS wx::net wx::core wx::base)
+	else ()
+		include(${wxWidgets_USE_FILE})
+		set(WX_LIBS ${wxWidgets_LIBRARIES})
+	endif ()
+else ()
+	message(STATUS "wxWidgets not found installed, fetching v3.3.1 from source...")
+
+	set(wxBUILD_SHARED ON CACHE BOOL "" FORCE)
+	set(wxBUILD_SAMPLES OFF CACHE BOOL "" FORCE)
+	set(wxBUILD_TESTS OFF CACHE BOOL "" FORCE)
+	set(wxBUILD_DEMOS OFF CACHE BOOL "" FORCE)
+	set(wxBUILD_PRECOMP OFF CACHE BOOL "" FORCE)
+
+	if (UNIX AND NOT APPLE)
+		set(wxBUILD_TOOLKIT gtk3 CACHE STRING "" FORCE)
+	endif ()
+
+	FetchContent_Declare(
+			wxWidgets
+			GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets.git
+			GIT_TAG v3.3.1
+			)
+	FetchContent_MakeAvailable(wxWidgets)
+
+	if (NOT TARGET wx::net)
+		add_library(wx::net ALIAS wxnet)
+		add_library(wx::core ALIAS wxcore)
+		add_library(wx::base ALIAS wxbase)
+	endif ()
+	set(WX_LIBS wx::net wx::core wx::base)
+endif ()
+
+# 4. commonItems
+find_package(commonItems QUIET)
+if (NOT commonItems_FOUND)
+	message(STATUS "commonItems not found, fetching from source...")
+	set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
+
+	FetchContent_Declare(
+			commonItems
+			GIT_REPOSITORY https://github.com/tategotoazarasi/commonItems.git
+			GIT_TAG 45863c7
+			)
+	FetchContent_MakeAvailable(commonItems)
+endif ()
+
+# --- Sources ---
+# Use CMAKE_CURRENT_SOURCE_DIR to work correctly when built as submodule
+set(FRONTER_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Fronter/Source)
+
+file(GLOB MAIN_SOURCES "${FRONTER_SOURCE_DIR}/*.cpp")
+file(GLOB CONFIGURATION_SOURCES "${FRONTER_SOURCE_DIR}/Configuration/*.cpp")
+file(GLOB CONFIGURATION_OPTIONS_SOURCES "${FRONTER_SOURCE_DIR}/Configuration/Options/*.cpp")
+file(GLOB FRAMES_SOURCES "${FRONTER_SOURCE_DIR}/Frames/*.cpp")
+file(GLOB FRAMES_TABS_SOURCES "${FRONTER_SOURCE_DIR}/Frames/Tabs/*.cpp")
+file(GLOB UTILS_SOURCES "${FRONTER_SOURCE_DIR}/Utils/*.cpp")
+file(GLOB UTILS_LOCALIZATION_SOURCES "${FRONTER_SOURCE_DIR}/Utils/Localization/*.cpp")
+file(GLOB LOGWATCHER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/LogWatcher/*.cpp")
+file(GLOB MODCOPIER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/ModCopier/*.cpp")
+file(GLOB UPDATECHECKER_SOURCES "${FRONTER_SOURCE_DIR}/UpdateChecker/*.cpp")
+
+if (WIN32)
+	set(CONVERTERLAUNCHER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/ConverterLauncher/WinConverterLauncher.cpp")
+elseif (UNIX)
+	set(CONVERTERLAUNCHER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/ConverterLauncher/LinuxConverterLauncher.cpp")
+endif ()
+file(GLOB CONVERTERLAUNCHER_COMMON "${FRONTER_SOURCE_DIR}/WorkerThreads/ConverterLauncher/ConverterLauncher.cpp")
+list(APPEND CONVERTERLAUNCHER_SOURCES ${CONVERTERLAUNCHER_COMMON})
+
+# --- Target ---
+# WIN32 is required for wxWidgets Entry Point
+add_executable(ConverterFrontend WIN32
+               ${MAIN_SOURCES}
+               ${CONFIGURATION_SOURCES}
+               ${CONFIGURATION_OPTIONS_SOURCES}
+               ${FRAMES_SOURCES}
+               ${FRAMES_TABS_SOURCES}
+               ${UTILS_SOURCES}
+               ${UTILS_LOCALIZATION_SOURCES}
+               ${CONVERTERLAUNCHER_SOURCES}
+               ${LOGWATCHER_SOURCES}
+               ${MODCOPIER_SOURCES}
+               ${UPDATECHECKER_SOURCES}
+               )
+
+# --- Includes ---
+target_include_directories(ConverterFrontend PRIVATE
+                           "${FRONTER_SOURCE_DIR}"
+                           )
+
+# --- Linking ---
+target_link_libraries(ConverterFrontend PRIVATE
+                      commonItems::commonItems
+                      SQLiteCpp::SQLiteCpp
+                      CURL::libcurl
+                      ${WX_LIBS}
+                      )
+
+# --- Platform Specifics ---
+if (WIN32)
+	target_compile_definitions(ConverterFrontend PRIVATE WXUSINGDLL)
+	target_compile_definitions(ConverterFrontend PRIVATE UNICODE _UNICODE)
+endif ()
+
+# --- Post Build ---
+# Unified Post-Build for all platforms.
+# We discard Copy_Files.sh because it hardcodes paths relative to standalone builds,
+# breaking submodule/FetchContent builds on Linux.
+
+add_custom_command(TARGET ConverterFrontend POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration
+                   COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/Fronter/Resources/converter.ico ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+                   COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/Fronter/Resources/GeneralFAQ-READ.ME.FIRST.txt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+                   COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_languages.yml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_english.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_french.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_german.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_italian.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_latin.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_russian.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/Fronter/Resources/converter_l_simp_chinese.yml" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Configuration/"
+                   COMMENT "Copying resources..."
+                   )