[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: KDE/kdelibs
From:       Michael Jansen <info () michael-jansen ! biz>
Date:       2009-04-12 23:34:38
Message-ID: 200904130134.39044.info () michael-jansen ! biz
[Download RAW message or body]

This change breaks find_package(KDE4) for applications with install_prefix != 
kdedir.

<mjansen> ok ... i'm having trouble with find_package(kde4 required) . i think 
we have a catch 22 there.
<mjansen> FindKDE4Internal.cmake:313 tries to find phonon
<mjansen> phone looks in KDE4_LIB_INSTALL_DIR
<mjansen> s/phone/phonon/
<mjansen> KDE4_LIB_INSTALL_DIR is set by KDELibsDependencies.cmake
<mjansen> which is included in line 436 in FindKDE4Internal.cmake
<mjansen> is this supposed to work?
<mjansen> the change was done by alex two weeks ago
<mjansen> it doesn't work for me
<freeedrich|> mjansen: neither does it here!
<mjansen> freeedrich|, thanks ... thought so
<freeedrich|> mjansen: only apps which try to install to the same prefix get 
it.
<freeedrich|> unprefixed ones don't :/

Mike

On Friday 27 March 2009 22:04:56 Alexander Neundorf wrote:
> SVN commit 945641 by neundorf:
>
> -don't require Perl for building any KDE4 app, this is not necessary
> (documented on techbase) -add a better message if Phonon could not be found
>
> Alex
>
>
>
>
>  M  +3 -1      CMakeLists.txt
>  M  +18 -12    cmake/modules/FindKDE4Internal.cmake
>
>
> --- trunk/KDE/kdelibs/CMakeLists.txt #945640:945641
> @@ -45,7 +45,9 @@
>    endif(NOT X11_SM_FOUND)
>  endif(UNIX AND Q_WS_X11)
>
> -#required features
> +#required features:
> +# Perl is used e.g. in khtml, kjs, kjsembed and others
> +find_package(Perl REQUIRED)
>  find_package(ZLIB REQUIRED)
>  set(STRIGI_MIN_VERSION 0.6.3)
>  find_package(Strigi REQUIRED)
> --- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #945640:945641
> @@ -303,25 +303,36 @@
>  # for compatibility with KDE 4.0.x
>  set(KDE4_AUTOMOC_EXECUTABLE        "${AUTOMOC4_EXECUTABLE}" )
>
> -# Perl is required for building KDE software
> -find_package(Perl ${_REQ_STRING_KDE4})
> +# Perl is not required for building KDE software, but we had that here
> since 4.0 +find_package(Perl)
> +if(NOT PERL_FOUND)
> +   message(STATUS "Perl not found")
> +endif(NOT PERL_FOUND)
>
> +# only make Phonon REQUIRED if KDE4 itself is REQUIRED
> +find_package(Phonon ${_REQ_STRING_KDE4})
> +set(KDE4_PHONON_LIBRARY ${PHONON_LIBRARY})
> +set(KDE4_PHONON_LIBS ${PHONON_LIBS})
> +set(KDE4_PHONON_INCLUDES ${PHONON_INCLUDES})
> +
> +
>  # Check that we really found everything.
>  # If KDE4 was searched with REQUIRED, we error out with FATAL_ERROR if
> something wasn't found # already above in the other FIND_PACKAGE() calls.
>  # If KDE4 was searched without REQUIRED and something in the
> FIND_PACKAGE() calls above wasn't found, # then we get here and must check
> that everything has actually been found. If something is missing, # we must
> not fail with FATAL_ERROR, but only not set KDE4_FOUND. -if(NOT PERL_FOUND)
> -   message(STATUS "KDE4 not found, because Perl not found")
> -   return()
> -endif(NOT PERL_FOUND)
>
>  if(NOT QT4_FOUND)
> -   message(STATUS "KDE4 not found, because Qt4 not found")
> +   message(STATUS "KDE4 not found, because Qt4 was not found")
>     return()
>  endif(NOT QT4_FOUND)
>
> +if(NOT PHONON_FOUND)
> +   message(STATUS "KDE4 not found, because Phonon was not found")
> +   return()
> +endif(NOT PHONON_FOUND)
> +
>  if(NOT AUTOMOC4_FOUND OR NOT _automoc4_version_ok)
>     if(NOT AUTOMOC4_FOUND)
>        message(${_REQ_STRING_KDE4_MESSAGE} "KDE4 not found, because
> Automoc4 not found.") @@ -1159,11 +1170,6 @@
>     message(FATAL_ERROR "ERROR: could NOT find everything required for
> compiling KDE 4 programs") endif (KDE4Internal_FIND_REQUIRED AND NOT
> KDE4_FOUND)
>
> -find_package(Phonon REQUIRED)
> -set(KDE4_PHONON_LIBRARY ${PHONON_LIBRARY})
> -set(KDE4_PHONON_LIBS ${PHONON_LIBS})
> -set(KDE4_PHONON_INCLUDES ${PHONON_INCLUDES})
> -
>  if (NOT KDE4Internal_FIND_QUIETLY)
>     kde4_print_results()
>  endif (NOT KDE4Internal_FIND_QUIETLY)

[prev in list] [next in list] [prev in thread] [next in thread]