FindAutomoc4.cmake.diff

[Thiago Macieira]

guru wrote:
>hi
>made a patch for /usr/lib64 to work finding automoc4
>
>--- kdelibs-4.0.84/cmake/modules/FindAutomoc4.cmake.org 2008-06-03
> 09:34:52.000000000 +00 +++
> kdelibs-4.0.84/cmake/modules/FindAutomoc4.cmake     2008-07-04
> 23:10:57.000000000 +00 @@ -32,7 +32,7 @@
>              PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4
>              PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH}
> ${CMAKE_SYSTEM_PREFIX_ ${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH}
> ${CMAKE_SYSTEM_LIBRA -                   ${CMAKE_INSTALL_PREFIX}/lib
>+                   ${CMAKE_INSTALL_PREFIX}/
>              NO_DEFAULT_PATH )
> endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")

Well, the patch is truncated (your copy/paste did an area selection, 
instead of line selection).

But the meaning is clear: the ${CMAKE_INSTALL_PREFIX} expansion should not 
be followed by "lib", since that is already searched by the suffixes 
above.

Also, should we add lib32? Or the 4 recommended suffixes for Itanium?

-- 
  Thiago Macieira  -  thiago (AT) macieira.info - thiago (AT) kde.org
    PGP/GPG: 0x6EF45358; fingerprint:
    E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-buildsystem/attachments/20080708/6d81fb50/attachment.pgp