[kmymoney/4.8] /: Another cmake fix.

Christian Dávid christian-david at web.de
Fri Sep 30 09:29:25 UTC 2016


Hi Ralf,

I think it should be

if (${LibAlkimia_FOUND} AND DEFINED LibAlkimia_VERSION)

without ${}. This explains why you had an error if LibAlkimia_VERSION is not defined — because the expresion evaluates to "if (${LibAlkimia_FOUND} AND DEFINED)".

Also I want to highlight that Alkimia 6 uses the version parameter of find_package(). If there is something lower than version 6 required, it aborts. The find modules should not care about that additional parameter (unfortunatly I cannot test this because I cannot compile the 4.8 branch at the moment). So the whole test logic is not needed anymore.

Greetings
Christian

P.S.: @Thomas, I know this branch is at its end of lifetime. However, this seems to be more work than thought.

> Ralf Habacker <ralf.habacker at freenet.de> hat am 30. September 2016 um 09:48 geschrieben:
> 
> 
> Git commit 966efeb610171695686f936cc2bcd4956f5cd2e3 by Ralf Habacker.
> Committed on 30/09/2016 at 07:47.
> Pushed by habacker into branch '4.8'.
> 
> Another cmake fix.
> 
> CMake 3.5 also does not like to have DEFINED together with another
> statement in an if statement.
> 
> M  +5    -3    CMakeLists.txt
> 
> http://commits.kde.org/kmymoney/966efeb610171695686f936cc2bcd4956f5cd2e3
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 2257bd9..08d1803 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -118,9 +118,11 @@ if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
>    set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} )
>  endif()
>  # make sure we have the matching version of LibAlkimia (not too new)
> -if(${LibAlkimia_FOUND} AND DEFINED ${LibAlkimia_VERSION})
> -    if (NOT "${LibAlkimia_VERSION}" VERSION_LESS "6.0.0")
> -        message(FATAL_ERROR "This version of KMyMoney requires LibAlkimia < 6.0.0 and does not work with the installed version of LibAlkimia")
> +if(${LibAlkimia_FOUND})
> +    if (DEFINED ${LibAlkimia_VERSION})
> +        if (NOT "${LibAlkimia_VERSION}" VERSION_LESS "6.0.0")
> +            message(FATAL_ERROR "This version of KMyMoney requires LibAlkimia < 6.0.0 and does not work with the installed version of LibAlkimia")
> +        endif()
>      endif()
>  endif()
>  
>


More information about the KMyMoney-devel mailing list