Reshuffle folder structure

Reshuffle folder structure and update cmake.yml

.github/workflows/cmake.yml

@@ -21,11 +21,6 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
         BUILD_TYPE: [Debug, Release]
-        include:
-          - os: windows-latest
-          - BOOTSTRAP: bootstrap-vcpkg.bat
-          - os: ubuntu-latest
-          - BOOTSTRAP: bootstrap-vcpkg.sh
 
     steps:
     - name: checkout
@@ -33,8 +28,12 @@ jobs:
       with:
         submodules: true
 
-    - name: bootstrap-vcpkg
-      run: ${{github.workspace}}/external/vcpkg/${{matrix.BOOTSTRAP}}
+    - name: bootstrap vcpkg
+      if: runner.os == 'windows'
+      run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.bat -disableMetrics
+
+      if: runner.os != 'windows'
+      run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

CMakeLists.txt

@@ -17,11 +17,11 @@ OPTION(ENABLE_WARNINGS_AS_ERRORS "Warnings are treated as Errors" ON)
 OPTION(ENABLE_STATIC_ANALYSIS "Enable Static Analysis Tools" ON)
 OPTION(ENABLE_SANITIZERS "Enable Sanitizer Tools" ON)
 
-set(SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/scripts)
+set(CMAKE_SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/scripts/cmake)
 
-include(${SCRIPTS_DIR}/compilerwarnings.cmake)
-include(${SCRIPTS_DIR}/sanitizers.cmake)
-include(${SCRIPTS_DIR}/staticanalysis.cmake)
+include(${CMAKE_SCRIPTS_DIR}/compilerwarnings.cmake)
+include(${CMAKE_SCRIPTS_DIR}/sanitizers.cmake)
+include(${CMAKE_SCRIPTS_DIR}/staticanalysis.cmake)
 
 if (ENABLE_TESTS)
     message("Unit Testing Enabled")

src/CMakeLists.txt

@@ -5,6 +5,9 @@ add_executable(
     main.cpp
 )
 
+find_package(spdlog CONFIG REQUIRED)
+target_link_libraries(${current_target} PRIVATE spdlog::spdlog spdlog::spdlog_header_only)
+
 if( ENABLE_ALL_REASONABLE_WARNINGS )
     MESSAGE("Additional Warnings Enabled")
     target_enable_warnings(${current_target})
@@ -23,4 +26,4 @@ endif()
 if( ENABLE_STATIC_ANALYSIS )
     MESSAGE("Static Analysis Enabled")
     target_enable_static_analysis(${current_target})
-endif()
+endif()

src/main.cpp

@@ -1,8 +1,8 @@
-#include <cstdio>
+#include <spdlog/spdlog.h>
 
 auto main() -> int
 {
-	printf("Hello, World!");
+    spdlog::trace("Hello, World!");
 	return 0;
 }
 

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-include(${SCRIPTS_DIR}/googletest.cmake)
+include(${CMAKE_SCRIPTS_DIR}/googletest.cmake)
 
 add_executable(
   blank-slate-test