diff options
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | generator/qtdoc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | generator/shiboken/CMakeLists.txt | 11 |
3 files changed, 15 insertions, 13 deletions
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index d18958c27..bee90563e 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -20,17 +20,18 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${apiextractor_SOURCE_DIR} - ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTXML_INCLUDE_DIR}) + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Xml_INCLUDE_DIRS} + ) add_executable(shiboken ${shiboken_SRC}) add_dependencies(shiboken apiextractor) set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX}) target_link_libraries(shiboken apiextractor - ${QT_QTCORE_LIBRARY} - ${QT_QTXML_LIBRARY}) + ${Qt5Core_LIBRARIES} + ${Qt5Xml_LIBRARIES} + ) configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY) diff --git a/generator/qtdoc/CMakeLists.txt b/generator/qtdoc/CMakeLists.txt index 541e7c6ee..1361ba8f1 100644 --- a/generator/qtdoc/CMakeLists.txt +++ b/generator/qtdoc/CMakeLists.txt @@ -5,15 +5,15 @@ qtdocgenerator.cpp ) include_directories(${generators_SOURCE_DIR} - ${QT_QTCORE_INCLUDE_DIR} + ${Qt5Core_INCLUDE_DIRS} ${APIEXTRACTOR_INCLUDE_DIR}) add_executable(docgenerator main.cpp) set_target_properties(docgenerator PROPERTIES OUTPUT_NAME docgenerator${generator_SUFFIX}) -target_link_libraries(docgenerator ${QT_QTCORE_LIBRARY}) +target_link_libraries(docgenerator ${Qt5Core_LIBRARES}) add_library(qtdoc_generator SHARED ${qtdoc_generator_SRC}) -target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner) +target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${Qt5Core_LIBRARES} genrunner) set_property(TARGET qtdoc_generator PROPERTY PREFIX "") install(TARGETS qtdoc_generator DESTINATION ${generator_plugin_DIR}) diff --git a/generator/shiboken/CMakeLists.txt b/generator/shiboken/CMakeLists.txt index 57aac33ad..aa3405bd4 100644 --- a/generator/shiboken/CMakeLists.txt +++ b/generator/shiboken/CMakeLists.txt @@ -14,16 +14,17 @@ include_directories(${generators_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${APIEXTRACTOR_INCLUDE_DIR} - ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTXML_INCLUDE_DIR}) + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Xml_INCLUDE_DIRS} + ) add_executable(shiboken ${shiboken_SRC}) set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX}) target_link_libraries(shiboken ${APIEXTRACTOR_LIBRARY} - ${QT_QTCORE_LIBRARY} - ${QT_QTXML_LIBRARY}) + ${Qt5Core_LIBRARIES} + ${Qt5Xml_LIBRARIES} + ) configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY) |