766
|
1 --- ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-08-09 09:56:10.122995996 +0200 |
|
2 +++ ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-08-09 09:56:42.942997004 +0200 |
|
3 @@ -3,30 +3,6 @@ |
|
4 message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") |
|
5 endif() |
|
6 |
|
7 -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) |
|
8 -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) |
|
9 -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") |
|
10 -!!ELSE |
|
11 -get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) |
|
12 -# Use original install prefix when loaded through a |
|
13 -# cross-prefix symbolic link such as /lib -> /usr/lib. |
|
14 -get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) |
|
15 -get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) |
|
16 -if(_realCurr STREQUAL _realOrig) |
|
17 - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) |
|
18 -else() |
|
19 - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) |
|
20 -endif() |
|
21 -unset(_realOrig) |
|
22 -unset(_realCurr) |
|
23 -unset(_IMPORT_PREFIX) |
|
24 -!!ENDIF |
|
25 -!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) |
|
26 -get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) |
|
27 -!!ELSE |
|
28 -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") |
|
29 -!!ENDIF |
|
30 - |
|
31 !!IF !equals(TEMPLATE, aux) |
|
32 # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. |
|
33 set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") |
|
34 --- qmake/generators/makefile.cpp.orig 2019-08-09 09:58:25.371000151 +0200 |
|
35 +++ qmake/generators/makefile.cpp 2019-08-09 10:00:19.407003654 +0200 |
|
36 @@ -3298,10 +3298,10 @@ |
|
37 if(includeDir.isEmpty()) |
|
38 includeDir = prefix + "/include"; |
|
39 |
|
40 - t << "prefix=" << prefix << endl; |
|
41 - t << "exec_prefix=${prefix}\n" |
|
42 - << "libdir=" << pkgConfigFixPath(libDir) << "\n" |
|
43 - << "includedir=" << pkgConfigFixPath(includeDir) << endl; |
|
44 + t << "prefix=" << endl; |
|
45 + t << "exec_prefix=\n" |
|
46 + << "libdir=/lib\n" |
|
47 + << "includedir=/include\n"; |
|
48 t << endl; |
|
49 |
|
50 //extra PKGCONFIG variables |