diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-11-16 14:21:07 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-11-16 14:50:57 +0000 |
| commit | ee8176281ef36c29998e314c852d04412f410ec9 (patch) | |
| tree | 64a692e4116d551232cda6c32d6e47c6e60b4720 | |
| parent | 2b2ec45bc9f40caf19b98aeaafba6439bff6d9b4 (diff) | |
Fix build with CMake
Sync defines from jom[lib].pro.
Remove the wchar_t hack.
Change-Id: I48693d244bb8f0a4b80208f122df77bf33f3b5b8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5021051..6fbafa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,15 +21,12 @@ include_directories( ) if(MSVC) add_definitions( - -D_CRT_SECURE_NO_DEPRECATE + -D_CRT_SECURE_NO_WARNINGS ) - # Qt disables the native wchar_t type, do it too to avoid linking issues - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:wchar_t-" ) endif(MSVC) add_definitions( + -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII - -DQT_USE_FAST_CONCATENATION - -DQT_USE_FAST_OPERATOR_PLUS -DUNICODE ) |