D10011: make cmake/FindLibIcal.cmake ready for cross compilation.

[Christophe Giboudeaux]

cgiboudeaux added inline comments.

INLINE COMMENTS

> FindLibIcal.cmake:19
>  
> -#set the root from the LibIcal_BASE environment
> -file(TO_CMAKE_PATH "$ENV{LibIcal_BASE}" libical_root)
> +pkg_check_modules(LibIcal libical>=${LibIcal_FIND_VERSION})
>  

still missing the QUIET keyword.
Please also rename LibIcal to avoid confusion between the pkgconfig vars and the CMake ones (pick eg 'PC_LibIcal' )

> FindLibIcal.cmake:21
>  
> -#override the root from LibIcal_BASE defined to cmake
> -if(DEFINED LibIcal_BASE)
> -  file(TO_CMAKE_PATH "${LibIcal_BASE}" libical_root)
> +if(NOT LibIcal_INCLUDE_DIRS)
> +   set(LibIcal_INCLUDE_DIRS ${LibIcal_INCLUDEDIR})

Not needed here, it doesn't exist yet

> FindLibIcal.cmake:22
> +if(NOT LibIcal_INCLUDE_DIRS)
> +   set(LibIcal_INCLUDE_DIRS ${LibIcal_INCLUDEDIR})
>  endif()

it's not the right place for that. See below

> FindLibIcal.cmake:23
> +   set(LibIcal_INCLUDE_DIRS ${LibIcal_INCLUDEDIR})
>  endif()
>  

Remove

> FindLibIcal.cmake:37
> +     NAMES libical/ical.h
> +     HINTS ${libical_root}/include ${_program_FILES_DIR}/libical/include
> +   )

+ ${PC_LibIcal_INCLUDEDIR}

That's where we use the pkgconfig result

> FindLibIcal.cmake:43-44
> +     HINTS
> +       ${libical_root}/lib64 ${_program_FILES_DIR}/libical/lib64
> +       ${libical_root}/lib ${_program_FILES_DIR}/libical/lib
> +   )

+ ${PC_LibIcal_LIBDIR}

> FindLibIcal.cmake:50-51
> +     HINTS
> +       ${libical_root}/lib64 ${_program_FILES_DIR}/libical/lib64
> +       ${libical_root}/lib ${_program_FILES_DIR}/libical/lib
> +   )

+ ${PC_LibIcal_LIBDIR}

REPOSITORY
  R172 KCalendar Core

REVISION DETAIL
  https://phabricator.kde.org/D10011

To: knauss, #kde_pim, winterz
Cc: cgiboudeaux, dvasin, winterz, vkrause, mlaurent, knauss, dvratil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20180123/5f0444d3/attachment.html>