Remove Common folder in favor of ThirdParty

.gitignore

@@ -67,13 +67,10 @@ Thumbs.db
 
 *.lnk
 
-Common/vcpkg/**
 !ScreenPlay/translations/**
 /build-*/**
 *_qmlcache.qrc
 *.DS_Store
-/Common/vcpkg/
-Common/ffmpeg
 /Docs/html/screemplay.index
 
 #Steam
@@ -92,7 +89,6 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 .cmake/**
-/Common/ffmpeg/*
 /Docs/html/screenplay.index
 /ContentBuilder/**
 
@@ -250,7 +246,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 /aqtinstall.log
-/ThirdParty/**
 *.nupkg
 
 # SteamCmd creates a ton of tmp files
@@ -259,3 +254,10 @@ cython_debug/
 /tmp_steam_config/**
 /Tools/Steam/ContentBuilder/output/**
 /.vscode/settings.json
+
+# ThirdParty
+/ThirdParty/QArchive/**
+/ThirdParty/QArchive/
+/ThirdParty/qml-archive/**
+/ThirdParty/qml-plausible/
+/ThirdParty/ffmpeg/**

CMake/CMakeLists.txt

@@ -2,8 +2,7 @@ project(CMake)
 
 set(FILES
     CopyRecursive.cmake
-    CreateIFWInstaller.cmake
+    CreateIFWInstaller.cmake)
-    FetchContentThirdParty.cmake)
 
 add_custom_target(
     ${PROJECT_NAME}

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 3.18.0)
 
 project(
     ScreenPlay
@@ -34,6 +34,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
+set(THIRD_PARTY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/")
 
 option(OSX_BUNDLE "Enable distribution macOS bundle" OFF)
 
@@ -118,10 +119,11 @@ if(UNIX AND NOT APPLE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
 endif()
-include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/FetchContentThirdParty.cmake)
-
 
 add_subdirectory(CMake)
+add_subdirectory(ThirdParty)
+add_subdirectory(Tools)
+
 add_subdirectory(ScreenPlay)
 add_subdirectory(ScreenPlaySDK)
 add_subdirectory(ScreenPlayShader)
@@ -129,8 +131,6 @@ add_subdirectory(ScreenPlayWallpaper)
 add_subdirectory(ScreenPlayWidget)
 add_subdirectory(ScreenPlayUtil)
 add_subdirectory(ScreenPlayWeather)
-add_subdirectory(ThirdParty/QArchive)
-add_subdirectory(Tools)
 
 if(${SCREENPLAY_TESTS})
     enable_testing()

Common/CMakeLists.txt

@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.16.0)
-
-include(FetchContent)
-
-FetchContent_Declare(
-    qml-plausible
-    GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
-    GIT_TAG 00398446c7a2882a11d34c007a1ed8205c72e123)
-
-FetchContent_MakeAvailable(qml-plausible)

ScreenPlay/CMakeLists.txt

@@ -245,6 +245,7 @@ set(RESOURCES
 # Needed on macos
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
+find_package(LibArchive REQUIRED)
 
 # Make sentry win only for now because it is constantly buggy on osx
 if(WIN32)
@@ -299,6 +300,7 @@ target_link_libraries(
            Qt6::Svg
            Qt6::QuickControls2
            Qt6::Xml
+           LibArchive::LibArchive
            ScreenPlayUtil
            ScreenPlayUtilplugin
            QArchive
@@ -359,7 +361,7 @@ if(WIN32)
     set_property(TARGET ${PROJECT_NAME} PROPERTY WIN32_EXECUTABLE true)
 
     # Copy ffmpeg. If the ffmpeg files are missing, start the install_dependencies_XXX for your system!
-    file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../Common/ffmpeg/*")
+    file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/ffmpeg/*")
     foreach(filename ${files})
         configure_file(${filename} ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
     endforeach()

ThirdParty/CMakeLists.txt

@@ -1,9 +1,5 @@
-cmake_minimum_required(VERSION 3.16.0)
-
 include(FetchContent)
 
-set(THIRD_PARTY_PATH "${CMAKE_SOURCE_DIR}/ThirdParty/")
-
 FetchContent_Populate(
   QArchive
   GIT_REPOSITORY https://github.com/antony-jr/QArchive.git
@@ -13,8 +9,7 @@ FetchContent_Populate(
   # https://bugreports.qt.io/browse/QTCREATORBUG-27083
   SOURCE_DIR ${THIRD_PARTY_PATH}/QArchive
 )
-
+#lol
-
 FetchContent_Populate(
   qml-plausible
   GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
@@ -24,3 +19,6 @@ FetchContent_Populate(
   # https://bugreports.qt.io/browse/QTCREATORBUG-27083
   SOURCE_DIR ${THIRD_PARTY_PATH}/qml-plausible
 )
+
+add_subdirectory(qml-plausible)
+add_subdirectory(QArchive)

Tools/download_ffmpeg.py

@@ -102,7 +102,7 @@ def download_prebuild_ffmpeg_windows(extraction_path: str):
 def execute():
     # Make sure the script is always started from the same folder
     root_path = cd_repo_root_path()
-    extraction_path = os.path.join(root_path, "Common/ffmpeg")
+    extraction_path = os.path.join(root_path, "ThirdParty/ffmpeg")
 
     if os.path.exists(extraction_path):
         rmtree(extraction_path)