/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.4-FindQt4.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Jun 28 15:47:02 2012 UTC (2 years, 5 months ago) by kensington
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Remove old versions and unused patches.

(Portage version: 2.1.11.3/cvs/Linux x86_64)

1 --- cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake.org 2011-03-09 19:08:15.384000064 +0100
2 +++ cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake 2011-03-09 19:09:18.162000065 +0100
3 @@ -835,7 +835,7 @@
4 PATHS
5 ${QT_HEADERS_DIR}/${QT_MODULE}
6 ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
7 - NO_DEFAULT_PATH
8 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
9 )
10 # phonon doesn't seem consistent, let's try phonondefs.h for some
11 # installations
12 @@ -844,7 +844,7 @@
13 PATHS
14 ${QT_HEADERS_DIR}/${QT_MODULE}
15 ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
16 - NO_DEFAULT_PATH
17 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
18 )
19 ENDIF(${QT_MODULE} STREQUAL "phonon")
20 ENDFOREACH(QT_MODULE)
21 @@ -854,11 +854,11 @@
22 # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
23 FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
24 PATHS ${QT_HEADERS_DIR}/ActiveQt
25 - NO_DEFAULT_PATH
26 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
27 )
28 FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt
29 PATHS ${QT_HEADERS_DIR}/ActiveQt
30 - NO_DEFAULT_PATH
31 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
32 )
33 ENDIF(Q_WS_WIN)
34
35 @@ -867,7 +867,7 @@
36 PATHS
37 ${QT_HEADERS_DIR}/QtDesigner
38 ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
39 - NO_DEFAULT_PATH
40 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
41 )
42
43 # Set QT_QTASSISTANT_INCLUDE_DIR
44 @@ -875,7 +875,7 @@
45 PATHS
46 ${QT_HEADERS_DIR}/QtAssistant
47 ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
48 - NO_DEFAULT_PATH
49 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
50 )
51
52 # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
53 @@ -883,7 +883,7 @@
54 PATHS
55 ${QT_HEADERS_DIR}/QtAssistant
56 ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
57 - NO_DEFAULT_PATH
58 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
59 )
60
61 ########################################
62 @@ -897,11 +897,11 @@
63 STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
64 FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE
65 NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4
66 - PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
67 + PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
68 )
69 FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG
70 NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4
71 - PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
72 + PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
73 )
74 ENDFOREACH(QT_MODULE)
75
76 @@ -911,26 +911,26 @@
77 ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
78
79 # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
80 - FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
81 - FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
82 + FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
83 + FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
84
85 # Set QT_QTMAIN_LIBRARY
86 IF(Q_WS_WIN)
87 - FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
88 - FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
89 + FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
90 + FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
91 ENDIF(Q_WS_WIN)
92
93 # Set QT_QTASSISTANTCLIENT_LIBRARY
94 - FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
95 - FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
96 + FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
97 + FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
98
99 # Set QT_QTASSISTANT_LIBRARY
100 - FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
101 - FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
102 + FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
103 + FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
104
105 # Set QT_QTHELP_LIBRARY
106 - FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
107 - FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
108 + FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
109 + FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
110 IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
111 FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})
112 ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
113 @@ -993,67 +993,67 @@
114 FIND_PROGRAM(QT_MOC_EXECUTABLE
115 NAMES moc-qt4 moc
116 PATHS ${QT_BINARY_DIR}
117 - NO_DEFAULT_PATH
118 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
119 )
120
121 FIND_PROGRAM(QT_UIC_EXECUTABLE
122 NAMES uic-qt4 uic
123 PATHS ${QT_BINARY_DIR}
124 - NO_DEFAULT_PATH
125 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
126 )
127
128 FIND_PROGRAM(QT_UIC3_EXECUTABLE
129 NAMES uic3
130 PATHS ${QT_BINARY_DIR}
131 - NO_DEFAULT_PATH
132 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
133 )
134
135 FIND_PROGRAM(QT_RCC_EXECUTABLE
136 NAMES rcc
137 PATHS ${QT_BINARY_DIR}
138 - NO_DEFAULT_PATH
139 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
140 )
141
142 FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
143 NAMES qdbuscpp2xml
144 PATHS ${QT_BINARY_DIR}
145 - NO_DEFAULT_PATH
146 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
147 )
148
149 FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
150 NAMES qdbusxml2cpp
151 PATHS ${QT_BINARY_DIR}
152 - NO_DEFAULT_PATH
153 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
154 )
155
156 FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
157 NAMES lupdate-qt4 lupdate
158 PATHS ${QT_BINARY_DIR}
159 - NO_DEFAULT_PATH
160 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
161 )
162
163 FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
164 NAMES lrelease-qt4 lrelease
165 PATHS ${QT_BINARY_DIR}
166 - NO_DEFAULT_PATH
167 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
168 )
169
170 FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
171 NAMES qcollectiongenerator-qt4 qcollectiongenerator
172 PATHS ${QT_BINARY_DIR}
173 - NO_DEFAULT_PATH
174 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
175 )
176
177 FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
178 NAMES designer-qt4 designer
179 PATHS ${QT_BINARY_DIR}
180 - NO_DEFAULT_PATH
181 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
182 )
183
184 FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
185 NAMES linguist-qt4 linguist
186 PATHS ${QT_BINARY_DIR}
187 - NO_DEFAULT_PATH
188 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
189 )
190
191 IF (QT_MOC_EXECUTABLE)
192 @@ -1158,11 +1158,11 @@
193 IF(QT_IS_STATIC)
194 FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE
195 NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
196 - PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
197 + PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
198 )
199 FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG
200 NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
201 - PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
202 + PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
203 )
204 _QT4_ADJUST_LIB_VARS(${QT_PLUGIN})
205 ELSE(QT_IS_STATIC)
206 @@ -1171,11 +1171,11 @@
207 SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX})
208 FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE
209 NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
210 - PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
211 + PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
212 )
213 FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG
214 NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
215 - PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
216 + PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
217 )
218 MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG)
219 SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT})

  ViewVC Help
Powered by ViewVC 1.1.20