Build: Decouple compiler specific settings from os settings

Shauren · Jun 15, 2024 · 7b0f2f4 · 7b0f2f4
1 parent a8bf397
commit 7b0f2f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 58 deletions.
diff --git a/cmake/compiler/mingw/settings.cmake b/cmake/compiler/mingw/settings.cmake
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake
@@ -35,3 +35,13 @@ if(WIN32)
 elseif(UNIX)
   include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
 endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake")
+endif()
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
@@ -49,11 +49,3 @@ message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/lib")
-
-if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
-elseif(CMAKE_C_COMPILER MATCHES "icc")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
-elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
-endif()
diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake
@@ -6,11 +6,3 @@ add_definitions(-DTRINITY_REQUIRED_WINDOWS_BUILD=18362)
 
 # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>")
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake)
-elseif(CMAKE_CXX_PLATFORM_ID MATCHES "MinGW")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/mingw/settings.cmake)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
-endif()