The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 900cbcd2adfd80b0060e1f906bd24e97052e3358 Author: Vincent van Ravesteijn <[email protected]> Date: Sun May 12 12:26:44 2013 +0200 qt5: Treat wchar_t as a builtin type Qt5 is compiled treating wchar_t as a builtin type, while Qt4 did not. So, we have to do the same. diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e64a01..0670356 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -680,9 +680,12 @@ if(MSVC) set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}") endif() - 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-") + + if (NOT Qt5Core_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-") + endif() message(STATUS "----- Warning level : ${CMAKE_CXX_WARNING_LEVEL} ${WARNING_LEVEL_MESSAGE}") message(STATUS "----- Warnings as errors : ${MSVC_W_ERROR}") ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
