From 6dbbfca0309c960ef3a52f065199d3fa4f99760b Mon Sep 17 00:00:00 2001 From: obligaron Date: Mon, 12 Jul 2021 19:40:42 +0200 Subject: [PATCH] Don't use -fpermissive on msvc --- 3rdParty/libzt/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt index d9081a4ae..3a6414ca5 100644 --- a/3rdParty/libzt/CMakeLists.txt +++ b/3rdParty/libzt/CMakeLists.txt @@ -7,12 +7,18 @@ FetchContent_Declare(libzt FetchContent_MakeAvailableExcludeFromAll(libzt) # External library, ignore all warnings -target_compile_options(zto_obj PRIVATE -fpermissive -w) +target_compile_options(zto_obj PRIVATE -w) target_compile_options(libnatpmp_obj PRIVATE -w) -target_compile_options(libzt_obj PRIVATE -fpermissive -w) +target_compile_options(libzt_obj PRIVATE -w) target_compile_options(lwip_obj PRIVATE -w) target_compile_options(miniupnpc_obj PRIVATE -w) -target_compile_options(zt-static PRIVATE -fpermissive -w) +target_compile_options(zt-static PRIVATE -w) + +if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + target_compile_options(zto_obj PRIVATE -fpermissive) + target_compile_options(libzt_obj PRIVATE -fpermissive) + target_compile_options(zt-static PRIVATE -fpermissive) +endif() target_include_directories(zt-static INTERFACE "${libzt_SOURCE_DIR}/include"