| commit | 6622877a09a1ec6d38132bcdc9ac9a856d1c3931 | [log] [tgz] |
|---|---|---|
| author | Nobuaki Sukegawa <nsukeg@gmail.com> | Sun Dec 07 21:45:33 2014 +0900 |
| committer | Roger Meier <roger@apache.org> | Sun Dec 21 16:36:47 2014 +0100 |
| tree | 9e87f1f75b6f3644b2d3f757f8725a7622d26f22 | |
| parent | 6304a5341459eaa33e64aea80e0d0cc7d1b0b765 [diff] [blame] |
THRIFT-2098 Add support for Qt5+
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index 25b551e..7838726 100755 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt
@@ -180,6 +180,11 @@ TARGET_LINK_LIBRARIES_THRIFT(thriftqt ${SYSLIBS} Qt4::QtCore Qt4::QtNetwork) endif() +if(WITH_QT5) + # Qt5 has its own directory to avoid conflict with Qt4 caused by CMAKE_AUTOMOC + add_subdirectory(src/thrift/qt) +endif() + if(MSVC) add_definitions("-DUNICODE -D_UNICODE") endif()