Update to match window-starter template

.github/workflows/ci.yml

@@ -18,46 +18,38 @@ jobs:
         os: [windows-latest, ubuntu-latest, macos-latest]
         build_configuration: [Debug, Release]
         compiler: [llvm, gcc]
-        vcpkg_bootstrap: [bootstrap-vcpkg.sh]
 
         exclude:
           - os: windows-latest
-            vcpkg_bootstrap: bootstrap-vcpkg.sh
 
         include:
           - os: 'windows-latest'
             triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
             compiler: llvm
             build_configuration: Debug
 
           - os: 'windows-latest'
             triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
             compiler: llvm
             build_configuration: Release
 
           - os: 'windows-latest'
             triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
             compiler: gcc
             build_configuration: Debug
 
           - os: 'windows-latest'
             triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
             compiler: gcc
             build_configuration: Release
 
           - os: 'windows-latest'
             triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
             compiler: msvc
             build_configuration: Debug
 
           - os: 'windows-latest'
             triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
             compiler: msvc
             build_configuration: Release
 
@@ -70,22 +62,12 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v3
-      with:
-        submodules: true
 
     - name: cache
       uses: actions/cache@v3
       with:
-        path: |
+        path: "**/cpm_modules"
-          ~/vcpkg
+        key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
-          ./build/vcpkg_installed
-          ${{ env.HOME }}/.cache/vcpkg/archives
-          ${{ env.XDG_CACHE_HOME }}/vcpkg/archives
-          ${{ env.LOCALAPPDATA }}\vcpkg\archives
-          ${{ env.APPDATA }}\vcpkg\archives
-        key: ${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.build_configuration }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.build_configuration }}-
 
     - name: setup dependencies
       uses: aminya/setup-cpp@v1
@@ -93,20 +75,11 @@ jobs:
         compiler: ${{ matrix.compiler }}
         vcvarsall: ${{ contains(matrix.os, 'windows')}}
         cmake: true
-        vcpkg: true
         ccache: true
         clangtidy: ${{ env.CLANG_TIDY_VERSION }}
-        cppcheck: true
-
-    - name: Boostrap Vcpkg
-      run: ${{github.workspace}}/external/vcpkg/${{matrix.vcpkg_bootstrap}} -disableMetrics
-
-    - name: Install packaged dependencies
-      run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet ${{matrix.triplet}}
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_configuration}}
-        -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/external/vcpkg/scripts/buildsystems/vcpkg.cmake
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_configuration}}

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "external/vcpkg"]
-	path = external/vcpkg
-	url = https://github.com/Microsoft/vcpkg.git

CMakeLists.txt

@@ -18,11 +18,6 @@ set(CMAKE_SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/scripts/cmake)
 include(${CMAKE_SCRIPTS_DIR}/compilerwarnings.cmake)
 include(${CMAKE_SCRIPTS_DIR}/sanitizers.cmake)
 include(${CMAKE_SCRIPTS_DIR}/staticanalysis.cmake)
-
+include(${CMAKE_SCRIPTS_DIR}/cpm.cmake)
-if (ENABLE_TESTS)
-    message("-- Unit Testing Enabled")
-    enable_testing()
-    add_subdirectory(test)
-endif()
 
 add_subdirectory(src)

cmake/cpm.cmake

@@ -0,0 +1,33 @@
+set(CPM_DOWNLOAD_VERSION 0.38.1)
+
+if(CPM_SOURCE_CACHE)
+  set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+  set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+else()
+  set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+endif()
+
+# Expand relative path. This is important if the provided path contains a tilde (~)
+get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
+
+function(download_cpm)
+  message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
+  file(DOWNLOAD
+       https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+       ${CPM_DOWNLOAD_LOCATION}
+  )
+endfunction()
+
+if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
+  download_cpm()
+else()
+  # resume download if it previously failed
+  file(READ ${CPM_DOWNLOAD_LOCATION} check)
+  if("${check}" STREQUAL "")
+    download_cpm()
+  endif()
+  unset(check)
+endif()
+
+include(${CPM_DOWNLOAD_LOCATION})

cmake/googletest.cmake

@@ -0,0 +1,18 @@
+include_guard()
+
+CPMAddPackage(
+  NAME googletest
+  GITHUB_REPOSITORY google/googletest
+  GIT_TAG v1.13.0
+  VERSION 1.13.0
+  OPTIONS
+      "INSTALL_GTEST OFF"
+      "gtest_force_shared_crt ON"
+)
+
+set_property(TARGET 
+	gtest 
+	gtest_main 
+	gmock
+	gmock_main
+	PROPERTY FOLDER third_party/GoogleTest)

scripts/cmake/googletest.cmake

@@ -1,18 +0,0 @@
-include_guard()
-
-include(FetchContent)
-FetchContent_Declare(
-  googletest
-  GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG        58d77fa8070e8cec2dc1ed015d66b454c8d78850 # release-1.12.1
-)
-# For Windows: Prevent overriding the parent project's compiler/linker settings
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-FetchContent_MakeAvailable(googletest)
-
-set_property(TARGET 
-	gtest 
-	gtest_main 
-	gmock
-	gmock_main
-	PROPERTY FOLDER GoogleTest)

test/CMakeLists.txt

@@ -1,14 +0,0 @@
-include(${CMAKE_SCRIPTS_DIR}/googletest.cmake)
-
-add_executable(
-  opengl-starter-test
-  test_main.cpp
-)
-
-target_link_libraries(
-  opengl-starter-test
-  gtest_main
-)
-
-include(GoogleTest)
-gtest_discover_tests(opengl-starter-test)

test/test_main.cpp

@@ -1,6 +0,0 @@
-#include <gtest/gtest.h>
-
-TEST(testmain, example)
-{
-    EXPECT_EQ(42, 7*6);
-}