cmake/modules

Christian Mollekopf mollekopf at kolabsys.com
Tue Oct 29 09:42:52 CET 2013


 cmake/modules/LibkolabxmlConfigVersion.cmake.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22bb499c4b4d59bccf02ba8c5e5f3fe86510e0a8
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue Oct 29 09:42:48 2013 +0100

    Fixed the major version comparison.
    
    else is really just an else no matter what's in the brackets.
    the major version needs to match.

diff --git a/cmake/modules/LibkolabxmlConfigVersion.cmake.in b/cmake/modules/LibkolabxmlConfigVersion.cmake.in
index 6859bc4..c311b70 100644
--- a/cmake/modules/LibkolabxmlConfigVersion.cmake.in
+++ b/cmake/modules/LibkolabxmlConfigVersion.cmake.in
@@ -7,7 +7,7 @@ set(PACKAGE_VERSION_MAJOR @Libkolabxml_VERSION_MAJOR@)
 
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_FIND_VERSION}" VERSION_LESS ${PACKAGE_VERSION_MAJOR} )
+elseif(NOT "${PACKAGE_FIND_VERSION_MAJOR}" VERSION_EQUAL "${PACKAGE_VERSION_MAJOR}" )
    #Major versions are incompatible and require an explicit switch
    set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )




More information about the commits mailing list