diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:14:42 +0200 |
| commit | e4079eca49adce16e31dac2a18d49d7a55817891 (patch) | |
| tree | 1dfb960ec1115b1f552afe8a013058542389505e /qmake/CMakeLists.txt | |
| parent | f32a6cfb6b6236533508901f114ab57396da8ff3 (diff) | |
| parent | ec6dc5f78453048c4f0604655a34c6c20c79d819 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Take 5.
Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
Diffstat (limited to 'qmake/CMakeLists.txt')
| -rw-r--r-- | qmake/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 04b89c3f95..9354558de0 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -67,7 +67,6 @@ add_qt_tool(qmake # special case ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h ../src/corelib/tools/qdatetime.cpp ../src/corelib/tools/qdatetime.h ../src/corelib/tools/qdatetime_p.h ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h - ../src/corelib/tools/qlinkedlist.cpp ../src/corelib/tools/qlinkedlist.h ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h ../src/corelib/tools/qlocale.cpp ../src/corelib/tools/qlocale.h ../src/corelib/tools/qlocale_tools.cpp ../src/corelib/tools/qlocale_tools_p.h @@ -123,9 +122,10 @@ add_qt_tool(qmake # special case # . # special case library generators + generators/mac generators/unix generators/win32 - generators/mac + library $<TARGET_PROPERTY:Qt::CorePrivate,INTERFACE_INCLUDE_DIRECTORIES> # special case ${CMAKE_BINARY_DIR}/src/corelib/global # special case: for qconfig.cpp ) @@ -152,8 +152,8 @@ extend_target(qmake CONDITION WIN32 library/registry.cpp # special case DEFINES UNICODE - _ENABLE_EXTENDED_ALIGNED_STORAGE _CRT_SECURE_NO_WARNINGS + _ENABLE_EXTENDED_ALIGNED_STORAGE _SCL_SECURE_NO_WARNINGS PUBLIC_LIBRARIES advapi32 |