From 90dd13ee1bd497d7724c2b1d0fd833d42f7001ad Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 5 Jun 2019 14:48:55 -0700 Subject: Use Modern CMake features instead of CMAKE_CXX_FLAGS (#24861) * Convert C++ standard settings and warning options from CMAKE__FLAGS to Modern CMake isms. * More $ generator expressions instead of CMAKE_CXX_FLAGS. * Use $ for all -fpermissive usage * Fix generator expression that generates multiple flags * Fix invalid use of CMAKE_CXX_FLAGS instead of CMAKE_C_FLAGS. * Treat AppleClang as though it is Clang (match pre-3.0 behavior). * Update our build system to understand that AppleClang is distinct from Clang and remove CMP0025 policy setting. * PR Feedback. --- src/dlls/mscorpe/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dlls') diff --git a/src/dlls/mscorpe/CMakeLists.txt b/src/dlls/mscorpe/CMakeLists.txt index 43deb47ec9..6a8919326b 100644 --- a/src/dlls/mscorpe/CMakeLists.txt +++ b/src/dlls/mscorpe/CMakeLists.txt @@ -10,7 +10,7 @@ set(MSCORPE_SOURCES ) if(NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-virtual-dtor") + add_compile_options($<$:-Wno-delete-non-virtual-dtor>) endif() add_library_clr(mscorpe STATIC -- cgit v1.2.3