From a7ca50cd447c6725114f93c423624f6907b158cd Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sun, 19 Nov 2023 15:39:12 -0300 Subject: [PATCH] build: use DEFINED to test the existence of the MSVC variable --- build-support/custom-modules/ns3-vcpkg-hunter.cmake | 2 +- build-support/macros-and-definitions.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-support/custom-modules/ns3-vcpkg-hunter.cmake b/build-support/custom-modules/ns3-vcpkg-hunter.cmake index db8acdc75..64155eca4 100644 --- a/build-support/custom-modules/ns3-vcpkg-hunter.cmake +++ b/build-support/custom-modules/ns3-vcpkg-hunter.cmake @@ -73,7 +73,7 @@ function(setup_vcpkg) ) endif() - if(${MSVC}) + if(DEFINED MSVC) message(FATAL_ERROR "vcpkg: Visual Studio is unsupported") else() # Check if required packages are installed (unzip curl tar) diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake index 0d10faf68..a308ccf08 100644 --- a/build-support/macros-and-definitions.cmake +++ b/build-support/macros-and-definitions.cmake @@ -205,7 +205,7 @@ macro(process_options) # Set warning level and warning as errors if(${NS3_WARNINGS}) - if(MSVC) + if(DEFINED MSVC) add_compile_options(/W3) # /W4 = -Wall + -Wextra if(${NS3_WARNINGS_AS_ERRORS}) add_compile_options(/WX)