diff options
author | Brent Cook <busterb@gmail.com> | 2023-10-02 03:31:24 -0500 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-10-29 11:17:00 -0500 |
commit | fca20b23d6065af522c3f2a1b034fa0768d44730 (patch) | |
tree | ded7dde4cb6f5c5a6ad1a0c60257b0af40071717 | |
parent | 70688874f84607f272ea0028ce8982f5db00cd52 (diff) | |
download | portable-fca20b23d6065af522c3f2a1b034fa0768d44730.tar.gz portable-fca20b23d6065af522c3f2a1b034fa0768d44730.tar.bz2 portable-fca20b23d6065af522c3f2a1b034fa0768d44730.zip |
remove unneeded switch for MSVC, cleanup comment alignment
-rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f3c8a05..8aaaf62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -63,11 +63,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | |||
63 | endif() | 63 | endif() |
64 | 64 | ||
65 | # Enable asserts regardless of build type | 65 | # Enable asserts regardless of build type |
66 | if(MSVC) | 66 | add_definitions(-UNDEBUG) |
67 | add_definitions(/UNDEBUG) | ||
68 | else() | ||
69 | add_definitions(-UNDEBUG) | ||
70 | endif() | ||
71 | 67 | ||
72 | set(BUILD_NC true) | 68 | set(BUILD_NC true) |
73 | 69 | ||
@@ -152,17 +148,17 @@ if(MSVC) | |||
152 | "C4100" # 'identifier' : unreferenced formal parameter | 148 | "C4100" # 'identifier' : unreferenced formal parameter |
153 | "C4127" # conditional expression is constant | 149 | "C4127" # conditional expression is constant |
154 | "C4146" # unary minus operator applied to unsigned type, | 150 | "C4146" # unary minus operator applied to unsigned type, |
155 | # result still unsigned | 151 | # result still unsigned |
156 | "C4244" # 'argument' : conversion from 'type1' to 'type2', | 152 | "C4244" # 'argument' : conversion from 'type1' to 'type2', |
157 | # possible loss of data | 153 | # possible loss of data |
158 | "C4245" # 'conversion' : conversion from 'type1' to 'type2', | 154 | "C4245" # 'conversion' : conversion from 'type1' to 'type2', |
159 | # signed/unsigned mismatch | 155 | # signed/unsigned mismatch |
160 | "C4267" # 'var' : conversion from 'size_t' to 'type', | 156 | "C4267" # 'var' : conversion from 'size_t' to 'type', |
161 | # possible loss of data | 157 | # possible loss of data |
162 | "C4389" # 'operator' : signed/unsigned mismatch | 158 | "C4389" # 'operator' : signed/unsigned mismatch |
163 | "C4706" # assignment within conditional expression | 159 | "C4706" # assignment within conditional expression |
164 | "C4996" # The POSIX name for this item is deprecated. | 160 | "C4996" # The POSIX name for this item is deprecated. |
165 | # Instead, use the ISO C and C++ conformant name | 161 | # Instead, use the ISO C and C++ conformant name |
166 | ) | 162 | ) |
167 | elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") | 163 | elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") |
168 | add_definitions(-D_CRT_SUPPRESS_RESTRICT) | 164 | add_definitions(-D_CRT_SUPPRESS_RESTRICT) |