mirror of
https://git.freebsd.org/ports.git
synced 2025-06-17 18:50:33 -04:00
4d55666226
- Set INSTALL_TARGET for cmake based ports to install/strip. This solves problem of installing non-stripped binaries (noticed by delphij for KDE4 ports) - Fix linking to -lpthread for cmake based ports (KDE4 ports are affected mostly)
27 lines
992 B
CMake
27 lines
992 B
CMake
--- ./Modules/FindQt4.cmake.orig 2009-02-21 23:36:50.000000000 +0300
|
|
+++ ./Modules/FindQt4.cmake 2009-03-20 13:20:18.000000000 +0300
|
|
@@ -319,7 +319,7 @@
|
|
|
|
GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
|
|
# check for qmake
|
|
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
|
|
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
|
|
@@ -855,13 +855,13 @@
|
|
)
|
|
|
|
FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
|
|
- NAMES lupdate
|
|
+ NAMES lupdate-qt4
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
|
|
- NAMES lrelease
|
|
+ NAMES lrelease-qt4
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|