summaryrefslogtreecommitdiffstats
path: root/macros.cygwin
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2011-12-01 13:11:31 -0600
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2011-12-01 13:11:31 -0600
commit7b587b2ad18ddf26a6f71447ed3198a8ec143bab (patch)
tree5eb52e07632c6cae358b26add8a0d8f84f34ab2b /macros.cygwin
parentba5b543e4905a8beb4461f53ce30801e933226e1 (diff)
downloadcygwin-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.
Diffstat (limited to 'macros.cygwin')
-rw-r--r--macros.cygwin13
1 files changed, 10 insertions, 3 deletions
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.