Changes

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - uses: actions/cache@v2
-        env: { ccache-prefix: 'ubuntu-${{ matrix.cc }}-ccache-${{ env.ccache-generation }}' }
+        env: { ccache-prefix: 'ubuntu-${{ matrix.cc }}-cpp-${{ matrix.cppVersion }}-ccache-${{ env.ccache-generation }}' }
         with:
           path: ${{ runner.workspace }}/.ccache
           key: ${{ env.ccache-prefix }}-${{ github.sha }}
@@ -130,14 +130,15 @@ jobs:
 
 
   ubuntu-clang-run:
-    name: ubuntu-clang-${{ matrix.type }}
+    name: ubuntu-clang-cpp-${{ matrix.cppVersion }}-${{ matrix.type }}
     runs-on: ubuntu-20.04
     needs: [ ubuntu-clang-build ]
 
     strategy:
       fail-fast: false
       matrix:
         cppVersion: [17, 20]
+        type: [spell_query, log_debug, patchwerk, dungeon_slice]
         include:
           - type: spell_query
             simc_flags: spell_query=spell > /dev/null

CMakeLists.txt

@@ -1,10 +1,5 @@
 # Projects Settings   
-cmake_minimum_required (VERSION 3.10...3.21)
-
-# allow enabling lto from the command line
-if(POLICY CMP0069)
-    cmake_policy(SET CMP0069 NEW)
-endif()
+cmake_minimum_required (VERSION 3.10...3.22)
 
 project(simc LANGUAGES CXX)
 
@@ -15,13 +10,17 @@ option(BUILD_GUI "Build the Qt gui along with cli binary" ON)
 option(SC_NO_THREADING "Disable all dependencies on pthreads" OFF)
 option(SC_NO_NETWORKING "Disable all networking related stuff." OFF)
 
+# Install everything into a flat folder structure by default for packaging on windows
+if (WINDOWS)
+  option(SC_USE_FLAT_INSTALL "Install files into a flat folder structure" YES)
+else()
+  option(SC_USE_FLAT_INSTALL "Install files into a flat folder structure" NO)
+endif()
+
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-# Require /permissive- when building with Visual Studio
-add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/permissive->)
-
 # enable colored output with ninja build system
 if(${CMAKE_GENERATOR} STREQUAL "Ninja")
     if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
@@ -31,52 +30,50 @@ if(${CMAKE_GENERATOR} STREQUAL "Ninja")
     endif()
 endif()
 
-# Default Blizzard Community Platform API key
-if (DEFINED SC_DEFAULT_APIKEY)
-    add_compile_options(-DSC_DEFAULT_APIKEY="${SC_DEFAULT_APIKEY}")
+# Install paths
+if (SC_USE_FLAT_INSTALL)
+  set(SIMC_INSTALL_BIN ".")
+  set(SIMC_INSTALL_SHARED ".")
+else()
+  set(SIMC_INSTALL_BIN "bin")
+  set(SIMC_INSTALL_SHARED "share/SimulationCraft/SimulationCraft")
 endif()
 
 # output a compile_commands.json used for editor tooling
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE STRING "Enable compile_commands.json generation")
 
-# Install paths
-if (UNIX)
-    set(SIMC_INSTALL_BIN "bin")
-    set(SIMC_INSTALL_SHARED "share/SimulationCraft/SimulationCraft")
-else() # Otherwise, install everything into a flat directory
-    set(SIMC_INSTALL_BIN ".")
-    set(SIMC_INSTALL_SHARED ".")
-endif()
+function(sc_common_compiler_options target)
+  target_compile_options(${target} PRIVATE
+    $<$<CXX_COMPILER_ID:MSVC>:/permissive->
+    $<$<CXX_COMPILER_ID:MSVC>:/W3>
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic>
+  )
+endfunction()
 
 # link in all activated targets
 add_subdirectory(engine)
 if (BUILD_GUI)
   add_subdirectory(qt)
 endif()
 
-# enable warnings
-if (NOT MSVC)
-    target_compile_options(engine PUBLIC -Wall -Wextra)
-endif()
-
-
 # 'simc' command line interface target
-include(source_files/cmake_engine_main.txt)
-string(REGEX REPLACE "([^;]+)" "engine/\\1" source_files "${source_files}")
-add_executable(simc ${source_files})
+add_executable(simc engine/sc_main.cpp)
 target_link_libraries(simc engine)
+sc_common_compiler_options(simc)
+
 install(TARGETS simc DESTINATION ${SIMC_INSTALL_BIN})
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/profiles/ DESTINATION ${SIMC_INSTALL_SHARED}/profiles
+
+install(DIRECTORY profiles/ DESTINATION ${SIMC_INSTALL_SHARED}/profiles
     FILES_MATCHING PATTERN "*.simc" )
 install(FILES 
-${CMAKE_CURRENT_SOURCE_DIR}/README.md
-${CMAKE_CURRENT_SOURCE_DIR}/CONTRIBUTING.md
-${CMAKE_CURRENT_SOURCE_DIR}/COPYING
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.BOOST
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.BSD
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.BSD2
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.LGPL
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.MIT
-${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.UNLICENSE
+  README.md
+  CONTRIBUTING.md
+  COPYING
+  LICENSE
+  LICENSE.BOOST
+  LICENSE.BSD
+  LICENSE.BSD2
+  LICENSE.LGPL
+  LICENSE.MIT
+  LICENSE.UNLICENSE
 DESTINATION ${SIMC_INSTALL_SHARED})