From 33a35a8ff4af38924c2c54fb53f8fdceab8f18e8 Mon Sep 17 00:00:00 2001 From: mic84 Date: Thu, 11 Jun 2020 17:09:54 -0700 Subject: [PATCH] CMake: fix bug introduced in PR #996 (#1009) --- Tools/CMake/AMReXFlagsTargets.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Tools/CMake/AMReXFlagsTargets.cmake b/Tools/CMake/AMReXFlagsTargets.cmake index 84481da7cac..5d50eec6f60 100644 --- a/Tools/CMake/AMReXFlagsTargets.cmake +++ b/Tools/CMake/AMReXFlagsTargets.cmake @@ -99,12 +99,20 @@ target_compile_options( Flags_CXX_REQUIRED # Currently can't make this a generator expression as amrex_evaluate_genex fails # to parse it and propagate the flags to cuda -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CXX_COMPILER_VERSION VERSION_LESS 19.26) - target_compile_options( Flags_CXX_REQUIRED - INTERFACE - $<${_cxx_msvc}:/experimental:preprocessor /Zc:preprocessor> - ) +if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if (CXX_COMPILER_VERSION VERSION_LESS 19.26) + target_compile_options( Flags_CXX_REQUIRED + INTERFACE + $<${_cxx_msvc}:/experimental:preprocessor> + ) + else () + target_compile_options( Flags_CXX_REQUIRED + INTERFACE + $<${_cxx_msvc}:/Zc:preprocessor> + ) + endif () endif() + # # Fortran REQUIRED flags -- This is for internal use only: it is useless to export it #