Merge pull request #17 from oblivioncth/dev

Merge to master for v0.9.0.1
oblivioncth · Sep 3, 2022 · 48fb0d7 · 48fb0d7
2 parents af1236a + 5a7be78
commit 48fb0d7
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 403 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.21.1)
 
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
-set(CLIFP_BASE_VERSION 0.9) # Required for CI/CD
+set(CLIFP_BASE_VERSION 0.9.0.1) # Required for CI/CD
 project(CLIFp
     VERSION ${CLIFP_BASE_VERSION}
     LANGUAGES CXX
@@ -32,6 +32,10 @@ enable_language("RC")
 set(PROJ_SCRIPTS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 list(APPEND CMAKE_MODULE_PATH "${PROJ_SCRIPTS_PATH}/module")
 
+# Get helper scripts
+include(CLIFp/FetchOBCMake)
+fetch_ob_cmake("v0.1")
+
 # General Variables
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(TARGET_ARCH x64)
@@ -71,7 +75,7 @@ set(PACKAGE_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/out/dist")
 #------------Set Global Build Rules----------------
 
 # Versioning
-include(CLIFp/VerboseVersioning)
+include(OB/VerboseVersioning)
 setup_verbose_versioning(PROJECT_VERSION_VERBOSE)
 
 #================= Build =========================
@@ -89,23 +93,23 @@ find_package(Qt6 REQUIRED COMPONENTS
 add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060000)
 
 # Fetch Qx (build and import from source)
-include(CLIFp/FetchQx)
-fetch_qx("183dfe17e846efa682ae9b9ec9a5b4deef52fbc6")
+include(OB/FetchQx)
+fetch_qx("v0.3.2")
 
 # Fetch libfp (build and import from source)
-include(CLIFp/Fetchlibfp)
-fetch_libfp("249d67a71871259e5d0f3504c412b1a12c58bc3e")
+include(OB/Fetchlibfp)
+fetch_libfp("v0.1.2")
 
 # Fetch QI-QMP (build and import from source)
-include(CLIFp/FetchQI-QMP)
-fetch_qi_qmp("975c634caa95c37599c12c7d0964e21c730ac1f5")
+include(OB/FetchQI-QMP)
+fetch_qi_qmp("v0.1.2.1")
 
 # Fetch QuaZip (build and import from source)
-include (CLIFP/FetchQuaZip)
+include (OB/FetchQuaZip)
 fetch_quazip("v1.3")
 
 # Fetch Neargye's Magic Enum
-include(CLIFp/FetchMagicEnum)
+include(OB/FetchMagicEnum)
 fetch_magicenum("v0.8.0")
 
 # Set app sources
@@ -188,7 +192,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES
 )
 
 ## Forward select project variables to C++ code
-include(CLIFp/ProjectVars)
+include(OB/ProjectVars)
 set_cxx_project_vars(${TARGET_NAME}
     VERSION_STR "\"${PROJECT_VERSION}\""
     SHORT_NAME "\"${PROJECT_NAME}\""
@@ -198,7 +202,7 @@ set_cxx_project_vars(${TARGET_NAME}
 )
 
 # Set target exe details
-include(CLIFp/WinExecutableDetails)
+include(OB/WinExecutableDetails)
 set_win_executable_details(${TARGET_NAME}
     ICON "res/app/CLIFp.ico"
     FILE_VER ${PROJECT_VERSION}

diff --git a/cmake/module/CLIFp/FetchMagicEnum.cmake b/cmake/module/CLIFp/FetchMagicEnum.cmake
diff --git a/cmake/module/CLIFp/FetchOBCMake.cmake b/cmake/module/CLIFp/FetchOBCMake.cmake
@@ -0,0 +1,13 @@
+# Sets up OBCMake to be imported via git
+
+# git_ref - Tag, branch name, or commit hash to retrieve. According to CMake docs,
+#           a commit hash is preferred for speed and reliability
+
+macro(fetch_ob_cmake git_ref)
+    include(FetchContent)
+    FetchContent_Declare(OBCMake
+        GIT_REPOSITORY "https://github.com/oblivioncth/OBCMake"
+        GIT_TAG ${git_ref}
+    )
+    FetchContent_MakeAvailable(OBCMake)
+endmacro()
diff --git a/cmake/module/CLIFp/FetchQI-QMP.cmake b/cmake/module/CLIFp/FetchQI-QMP.cmake
diff --git a/cmake/module/CLIFp/FetchQuaZip.cmake b/cmake/module/CLIFp/FetchQuaZip.cmake
diff --git a/cmake/module/CLIFp/FetchQx.cmake b/cmake/module/CLIFp/FetchQx.cmake
diff --git a/cmake/module/CLIFp/Fetchlibfp.cmake b/cmake/module/CLIFp/Fetchlibfp.cmake
diff --git a/cmake/module/CLIFp/ProjectVars.cmake b/cmake/module/CLIFp/ProjectVars.cmake
diff --git a/cmake/module/CLIFp/VerboseVersioning.cmake b/cmake/module/CLIFp/VerboseVersioning.cmake