diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-15 17:07:25 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-06-15 17:07:25 +0200 |
| commit | 12d1f4448c30d313e8f0e70d89f29b709f5dd70d (patch) | |
| tree | 969f304cc01eda0f94c17288cee7fc62c4e70697 /cmake/platform | |
| parent | a7c42f1ed55e586d0d817dd99865aa7c024b0140 (diff) | |
Build: Decouple compiler specific settings from os settings
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 8 | ||||
| -rw-r--r-- | cmake/platform/win/settings.cmake | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index bcd25af4903..dbed87ed6d8 100644 --- 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 index 297b46d75ac..36319ab23ec 100644 --- 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() |