[cmake-developers] OpenBSD patches: final patch for Qt3/Qt4 related stuff

[Brad King]

On 12/05/2012 12:36 PM, Amit Kulkarni wrote:
> @@ -96,6 +97,7 @@ if (QT_MT_REQUIRED)
>        "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
>        ENV QTDIR
>        ${GLOB_PATHS_LIB}
> +      /usr/local
>        /usr/local/qt
>        /usr/lib/qt
>        /usr/lib/qt3
> @@ -117,6 +119,7 @@ else ()
>        "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
>        ENV QTDIR
>        ${GLOB_PATHS_LIB}
> +      /usr/local
>        /usr/local/qt
>        /usr/lib/qt
>        /usr/lib/qt3
> @@ -136,6 +139,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
>      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
>      ENV QTDIR
>      ${GLOB_PATHS_LIB}
> +    /usr/local
>      /usr/local/qt
>      /usr/lib/qt3
>      /usr/share/qt3

I still don't understand the purpose of adding "/usr/local" in the PATHS
of a find_library call.  We already search "/usr/local/lib" automatically.
Unless the actual library files are "/usr/local/libq*.*" the path will
not help AFAICT.

> @@ -178,6 +183,7 @@ find_program(QT_UIC_EXECUTABLE
>    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
>    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
>    ${GLOB_PATHS_BIN}
> +    /usr/local
>      /usr/local/qt
>      /usr/lib/qt
>      /usr/lib/qt3

Similarly find_program already looks in /usr/local/bin.

I suspect the patch without the above hunks is sufficient.  Can anyone
on OpenBSD verify this please?

-Brad