diff --git a/cmake/FindLibgcrypt.cmake b/cmake/FindLibgcrypt.cmake
index 647d471f..0a0c6f55 100644
--- a/cmake/FindLibgcrypt.cmake
+++ b/cmake/FindLibgcrypt.cmake
@@ -6,8 +6,8 @@
 #
 # Input variables:
 #
-# - `LIBGCRYPT_INCLUDE_DIR`:  The Libgcrypt include directory.
-# - `LIBGCRYPT_LIBRARY`:      Path to `libgcrypt` library.
+# - `LIBGCRYPT_INCLUDE_DIR`:  Absolute path to Libgcrypt include directory.
+# - `LIBGCRYPT_LIBRARY`:      Absolute path to `libgcrypt` library.
 #
 # Defines:
 #
diff --git a/cmake/FindMbedTLS.cmake b/cmake/FindMbedTLS.cmake
index ccfd41e0..5b7c1c98 100644
--- a/cmake/FindMbedTLS.cmake
+++ b/cmake/FindMbedTLS.cmake
@@ -6,8 +6,8 @@
 #
 # Input variables:
 #
-# - `MBEDTLS_INCLUDE_DIR`:  The mbedTLS include directory.
-# - `MBEDCRYPTO_LIBRARY`:   Path to `mbedcrypto` library.
+# - `MBEDTLS_INCLUDE_DIR`:  Absolute path to mbedTLS include directory.
+# - `MBEDCRYPTO_LIBRARY`:   Absolute path to `mbedcrypto` library.
 #
 # Defines:
 #
diff --git a/cmake/FindWolfSSL.cmake b/cmake/FindWolfSSL.cmake
index e1f94348..2b4f5f16 100644
--- a/cmake/FindWolfSSL.cmake
+++ b/cmake/FindWolfSSL.cmake
@@ -6,8 +6,8 @@
 #
 # Input variables:
 #
-# - `WOLFSSL_INCLUDE_DIR`:  The wolfSSL include directory.
-# - `WOLFSSL_LIBRARY`:      Path to `wolfssl` library.
+# - `WOLFSSL_INCLUDE_DIR`:  Absolute path to wolfSSL include directory.
+# - `WOLFSSL_LIBRARY`:      Absolute path to `wolfssl` library.
 #
 # Defines:
 #
diff --git a/cmake/PickyWarnings.cmake b/cmake/PickyWarnings.cmake
index 893dc1c4..c3dd1c8e 100644
--- a/cmake/PickyWarnings.cmake
+++ b/cmake/PickyWarnings.cmake
@@ -14,12 +14,10 @@ option(PICKY_COMPILER "Enable picky compiler options" ON)
 if(ENABLE_WERROR)
   if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
     set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
-  else()
-    if(MSVC)
-      list(APPEND _picky_nocheck "-WX")
-    else()  # llvm/clang and gcc style options
-      list(APPEND _picky_nocheck "-Werror")
-    endif()
+  elseif(MSVC)
+    list(APPEND _picky_nocheck "-WX")
+  else()  # llvm/clang and gcc-style options
+    list(APPEND _picky_nocheck "-Werror")
   endif()
 
   if((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND