amarok 2.2 and phonon-xine backend

[Jeff Mitchell]

Jakob Kummerow wrote:
>> Heh. not works.
>> output log:
>>
>> CMake Warning (dev) in CMakeLists.txt:
>>  A logical block opening on the line
>>
>>    /var/tmp/usr/ports/audio/amarok-kde4/work/amarok-2.2.0/CMakeLists.txt:58 (if)
>>
>>  closes on the line
>>
>>    /var/tmp/usr/ports/audio/amarok-kde4/work/amarok-2.2.0/CMakeLists.txt:60 (endif)
>>
>>  with mis-matching arguments.
> 
> You need to insert the " AND NOT FREEBSD" part into both the "if" and
> the corresponding "endif" line, which gives the following patch:
> 
> --- ./CMakeLists.txt.orig     2009-09-30 09:21:06.000000000 -0400
> +++ ./CMakeLists.txt  2009-09-30 09:21:49.000000000 -0400
> @@ -55,9 +55,6 @@
> SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
>  if (CMAKE_COMPILER_IS_GNUCXX)
>      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
> -    if( NOT WIN32 AND NOT APPLE )
> +    if( NOT WIN32 AND NOT APPLE AND NOT FREEBSD)
>          SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
> -    endif( NOT WIN32 AND NOT APPLE )
> +    endif( NOT WIN32 AND NOT APPLE AND NOT FREEBSD)
>   endif (CMAKE_COMPILER_IS_GNUCXX)
> 
>   include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/shared )
> 
> This correction should make CMake happy. Since I don't have FreeBSD, I
> have no idea whether the changed code actually works.

Alternately, we could just do:

IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
...
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

--Jeff

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 261 bytes
Desc: OpenPGP digital signature
URL: <http://mail.kde.org/pipermail/amarok/attachments/20091001/84c46a8a/attachment.sig>