[LyX/master] Amend 635a7d77: define /Zc flag also with QT6

Eugene Chornyi yu_jin at lyx.org
Mon May 24 18:20:59 UTC 2021


commit 0cbc55805b979ae11c4a8d6454599fca8e75420c
Author: Eugene Chornyi <yu_jin at lyx.org>
Date:   Mon May 24 20:32:26 2021 +0200

    Amend 635a7d77: define /Zc flag also with QT6
---
 CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3eed1a..f36784a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1109,7 +1109,7 @@ if(MSVC)
 
 	endif()
 
-	if (NOT Qt5Core_FOUND)
+	if (NOT (Qt5Core_FOUND OR Qt6Core_FOUND))
 		set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /Zc:wchar_t-")
 		set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /Zc:wchar_t-")
 		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-")


More information about the lyx-cvs mailing list