diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-12-01 13:11:31 -0600 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-12-01 13:11:31 -0600 |
| commit | 7b587b2ad18ddf26a6f71447ed3198a8ec143bab (patch) | |
| tree | 5eb52e07632c6cae358b26add8a0d8f84f34ab2b | |
| parent | ba5b543e4905a8beb4461f53ce30801e933226e1 (diff) | |
| download | cygwin-filesystem-7b587b2ad18ddf26a6f71447ed3198a8ec143bab.tar.gz cygwin-filesystem-7b587b2ad18ddf26a6f71447ed3198a8ec143bab.tar.xz cygwin-filesystem-7b587b2ad18ddf26a6f71447ed3198a8ec143bab.zip | |
Define RPM and CMake macros to use new cygwin-qt-qmake scheme
cygwin-qt-qmake now provides versions of the Qt build tools to match
the version of cygwin-qt and include the Cygwin qmake patches.
Packages using cygwin-qt must use these tools instead of those from
the native qt-devel, so we provide the necessary definitions.
| -rw-r--r-- | Toolchain-cygwin.cmake | 9 | ||||
| -rw-r--r-- | cygwin-filesystem.spec | 3 | ||||
| -rw-r--r-- | macros.cygwin | 13 |
3 files changed, 21 insertions, 4 deletions
diff --git a/Toolchain-cygwin.cmake b/Toolchain-cygwin.cmake index 2811dda..61b6200 100644 --- a/Toolchain-cygwin.cmake +++ b/Toolchain-cygwin.cmake @@ -17,5 +17,14 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # FindQt4.cmake queries qmake to get information, # which doesn't work when crosscompiling +SET(QT_QMAKE_EXECUTABLE /usr/bin/i686-pc-cygwin-qmake) +SET(QT_MOC_EXECUTABLE /usr/bin/i686-pc-cygwin-moc) +SET(QT_RCC_EXECUTABLE /usr/bin/i686-pc-cygwin-rcc) +SET(QT_UIC_EXECUTABLE /usr/bin/i686-pc-cygwin-uic) +SET(QT_UIC3_EXECUTABLE /usr/bin/i686-pc-cygwin-uic3) +SET(QT_LRELEASE_EXECUTABLE /usr/bin/i686-pc-cygwin-lrelease) +SET(QT_LUPDATE_EXECUTABLE /usr/bin/i686-pc-cygwin-lupdate) +SET(QT_DBUSCPP2XML_EXECUTABLE /usr/bin/i686-pc-cygwin-qdbuscpp2xml) +SET(QT_DBUSXML2CPP_EXECUTABLE /usr/bin/i686-pc-cygwin-qdbusxml2cpp) SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index fb042ae..50cdce8 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -168,9 +168,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Nov 30 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 6-1 +* Thu Dec 01 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 6-1 - Define AUTOPOINT if cygwin-gettext is installed. - Forcefully disable /usr/bin/foo-config detection. +- Define RPM and CMake macros to use new cygwin-qt-qmake scheme. * Thu Jul 07 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 5-1 - Define LIBTOOLIZE if cygwin-libtool is installed. diff --git a/macros.cygwin b/macros.cygwin index 882cc9a..f66a5c4 100644 --- a/macros.cygwin +++ b/macros.cygwin @@ -48,6 +48,16 @@ %_cygwin_windmc %{_cygwin_target}-windmc %_cygwin_windres %{_cygwin_target}-windres +%_cygwin_qmake %{_cygwin_target}-qmake +%_cygwin_moc %{_cygwin_target}-moc +%_cygwin_rcc %{_cygwin_target}-rcc +%_cygwin_uic %{_cygwin_target}-uic +%_cygwin_uic3 %{_cygwin_target}-uic3 +%_cygwin_lrelease %{_cygwin_target}-lrelease +%_cygwin_lupdate %{_cygwin_target}-lupdate +%_cygwin_qdbuscpp2xml %{_cygwin_target}-qdbuscpp2xml +%_cygwin_qdbusxml2cpp %{_cygwin_target}-qdbusxml2cpp + %_cygwin_cache cygwin-config.cache %_cygwin_findprovides /usr/lib/rpm/cygwin-find-provides.sh @@ -187,9 +197,6 @@ package or when debugging this package.\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/cygwin/Toolchain-cygwin.cmake -%_cygwin_qmake_qt4 %{_cygwin_env} ; \ - %_qt4_qmake -spec cygwin-g++-cross - %_cygwin_description This is the cross-compiled version of this library / tool.\ You should only install this package if you want to cross-compile programs for \ Cygwin. |