cmake unified if conditions

silverqx · Jun 5, 2022 · 717613e · 717613e
1 parent d59a594
commit 717613e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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)