Skip to content

Commit 717613e

Browse files
committed
cmake unified if conditions
1 parent d59a594 commit 717613e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

cmake/CommonModules/TinyHelpers.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ upgrade the GCC compiler")
6464
endif()
6565
endif()
6666

67-
if(NOT MSVC AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
68-
OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
67+
if(NOT MSVC AND
68+
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
69+
CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
6970
)
7071
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS TINY_CLANG)
7172
message(STATUS "Minimum recommended Clang version was not satisfied, \

cmake/CommonModules/TinyMsvcParallel.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Allow per-translation-unit parallel builds when using MSVC
22
function(tiny_msvc_parallel desc)
33

4-
if(CMAKE_GENERATOR MATCHES "Visual Studio"
5-
AND (CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel"
6-
OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC|Intel")
4+
if(CMAKE_GENERATOR MATCHES "Visual Studio" AND
5+
(CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel" OR
6+
CMAKE_CXX_COMPILER_ID MATCHES "MSVC|Intel")
77
)
88
set(MSVC_PARALLEL ON CACHE STRING "${desc}")
99

cmake/Modules/TinyInitDefaultVariables.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ DESTINATION is encountered")
4646
# set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
4747

4848
# Fix install prefix for the MinGW and x64 toolchain
49-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows"
50-
AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
49+
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND
50+
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
5151
)
5252
get_property(help_string CACHE CMAKE_INSTALL_PREFIX PROPERTY HELPSTRING)
5353
if(NOT help_string)

0 commit comments

Comments
 (0)