diff options
| author | Christian Tismer <tismer@stackless.com> | 2015-06-05 13:16:45 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2015-06-05 18:33:39 +0200 |
| commit | 80134724bb28e564feb5a21b1ae3d7ba5a7de6c5 (patch) | |
| tree | 719ed6a2b041c0abc37c44401c91bb6a9311463d /ApiExtractor/CMakeLists.txt | |
| parent | aa39374b419c535dd56145ffebcef97c8c20eb39 (diff) | |
Multiple attempts to compile against Qt5 via pyside_setup.
We need to replace many things, and all includes are specific, now.
Trying to track down many errors, because certain structures in abstractmetabuilder.cpp
are no longer understood.
Diffstat (limited to 'ApiExtractor/CMakeLists.txt')
| -rw-r--r-- | ApiExtractor/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ApiExtractor/CMakeLists.txt b/ApiExtractor/CMakeLists.txt index 1e6edaf85..1123288ce 100644 --- a/ApiExtractor/CMakeLists.txt +++ b/ApiExtractor/CMakeLists.txt @@ -23,7 +23,7 @@ endif () set(QT_USE_QTCORE 1) set(QT_USE_QTXML 1) -include(${QT_USE_FILE}) +# no more supported: include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_SHARED) @@ -79,8 +79,8 @@ endif() set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) -qt4_add_resources(apiextractor_RCCS_SRC generator.qrc) -qt4_automoc(apiextractor_SRC) +qt5_add_resources(apiextractor_RCCS_SRC generator.qrc) +set(CMAKE_AUTOMOC ON) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -88,6 +88,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/parser/rpp ${QT_INCLUDE_DIR} ${APIEXTRACTOR_EXTRA_INCLUDES} + ${Qt5Core_INCLUDE_DIRS} ) add_library(apiextractor STATIC ${apiextractor_SRC} ${apiextractor_RCCS_SRC}) |