Mercurial > projects > qtd
changeset 64:753b1973273b
CMake: Another fixes for build on Windows
author | SokoL_SD |
---|---|
date | Tue, 19 May 2009 17:23:00 +0000 |
parents | a3617f393417 |
children | a62227112f5b |
files | generator/typesystem_gui.xml tools/duic/CMakeLists.txt |
diffstat | 2 files changed, 38 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/generator/typesystem_gui.xml Tue May 19 16:41:28 2009 +0000 +++ b/generator/typesystem_gui.xml Tue May 19 17:23:00 2009 +0000 @@ -4837,7 +4837,7 @@ <object-type name="QInputDialog"> <modify-function signature="open(QObject *, const char *)" remove="all"/> <!-- # TODO --> - +<!-- <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)"> <rename to="getDouble_private"/> <access modifier="private"/> @@ -4861,10 +4861,10 @@ <rename to="getText_private"/> <access modifier="private"/> </modify-function> - <inject-code> <import-file name="typesystem_gui-java.java" quote-after-line="class QInputDialog___" quote-before-line="}// class"/> </inject-code> +--> </object-type>
--- a/tools/duic/CMakeLists.txt Tue May 19 16:41:28 2009 +0000 +++ b/tools/duic/CMakeLists.txt Tue May 19 17:23:00 2009 +0000 @@ -1,34 +1,36 @@ -cmake_minimum_required(VERSION 2.6) -find_package(Qt4 REQUIRED) - -include_directories( ${QT_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/d ) - -########### next target ############### - -set(uic_bin_SRCS - customwidgetsinfo.cpp - databaseinfo.cpp - driver.cpp - treewalker.cpp - ui4.cpp - uic.cpp - validator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dextractimages.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dwritedeclaration.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteincludes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteicondata.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteicondeclaration.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteiconinitialization.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteinitialization.cpp - main.cpp ) - -add_executable(duic ${uic_bin_SRCS}) -set_target_properties(duic PROPERTIES OUTPUT_NAME duic) -set_target_properties(duic PROPERTIES COMPILE_FLAGS -DQT_UIC_D_GENERATOR) - -target_link_libraries(duic ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY}) - -install(TARGETS duic DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT qtd_tools) - +cmake_minimum_required(VERSION 2.6) +find_package(Qt4 REQUIRED) + +## TODO: Is this definition correct? +add_definitions(-DQDESIGNER_UILIB_LIBRARY) +include_directories( ${QT_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/d ) + +########### next target ############### + +set(uic_bin_SRCS + customwidgetsinfo.cpp + databaseinfo.cpp + driver.cpp + treewalker.cpp + ui4.cpp + uic.cpp + validator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dextractimages.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dwritedeclaration.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteincludes.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteicondata.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteicondeclaration.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteiconinitialization.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/d/dwriteinitialization.cpp + main.cpp ) + +add_executable(duic ${uic_bin_SRCS}) +set_target_properties(duic PROPERTIES OUTPUT_NAME duic) +set_target_properties(duic PROPERTIES COMPILE_FLAGS -DQT_UIC_D_GENERATOR) + +target_link_libraries(duic ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY}) + +install(TARGETS duic DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT qtd_tools) +