From 717613e848562c0934fa26fa6ded25c62bc451d5 Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 5 Jun 2022 13:40:46 +0200 Subject: [PATCH] cmake unified if conditions --- cmake/CommonModules/TinyHelpers.cmake | 5 +++-- cmake/CommonModules/TinyMsvcParallel.cmake | 6 +++--- cmake/Modules/TinyInitDefaultVariables.cmake | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/CommonModules/TinyHelpers.cmake b/cmake/CommonModules/TinyHelpers.cmake index 519e02ed7..ff8235795 100644 --- a/cmake/CommonModules/TinyHelpers.cmake +++ b/cmake/CommonModules/TinyHelpers.cmake @@ -64,8 +64,9 @@ upgrade the GCC compiler") endif() endif() - if(NOT MSVC AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" - OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") + if(NOT MSVC AND + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR + CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") ) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS TINY_CLANG) message(STATUS "Minimum recommended Clang version was not satisfied, \ diff --git a/cmake/CommonModules/TinyMsvcParallel.cmake b/cmake/CommonModules/TinyMsvcParallel.cmake index 01cb6db32..1ac00bd54 100644 --- a/cmake/CommonModules/TinyMsvcParallel.cmake +++ b/cmake/CommonModules/TinyMsvcParallel.cmake @@ -1,9 +1,9 @@ # Allow per-translation-unit parallel builds when using MSVC function(tiny_msvc_parallel desc) - if(CMAKE_GENERATOR MATCHES "Visual Studio" - AND (CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel" - OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC|Intel") + if(CMAKE_GENERATOR MATCHES "Visual Studio" AND + (CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel" OR + CMAKE_CXX_COMPILER_ID MATCHES "MSVC|Intel") ) set(MSVC_PARALLEL ON CACHE STRING "${desc}") diff --git a/cmake/Modules/TinyInitDefaultVariables.cmake b/cmake/Modules/TinyInitDefaultVariables.cmake index c7a95a852..efc197875 100644 --- a/cmake/Modules/TinyInitDefaultVariables.cmake +++ b/cmake/Modules/TinyInitDefaultVariables.cmake @@ -46,8 +46,8 @@ DESTINATION is encountered") # set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) # Fix install prefix for the MinGW and x64 toolchain - if(CMAKE_SYSTEM_NAME STREQUAL "Windows" - AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT + if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND + CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) get_property(help_string CACHE CMAKE_INSTALL_PREFIX PROPERTY HELPSTRING) if(NOT help_string)