Ticket #41835: patch-Modules-noArchCheck.diff

File patch-Modules-noArchCheck.diff, 2.9 KB (added by NicosPavlov, 11 years ago)

  • Modules/BasicConfigVersion-AnyNewerVersion.cmake.in 

    diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
    old new  
    1717    set(PACKAGE_VERSION_EXACT TRUE)
    1818  endif()
    1919endif()
    20 
    21 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
    22 if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
    23    return()
    24 endif()
    25 
    26 # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
    27 if(NOT "${CMAKE_SIZEOF_VOID_P}"  STREQUAL  "@CMAKE_SIZEOF_VOID_P@")
    28    math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
    29    set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    30    set(PACKAGE_VERSION_UNSUITABLE TRUE)
    31 endif()

  • Modules/BasicConfigVersion-ExactVersion.cmake.in 

    diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in ./Modules/BasicConfigVersion-ExactVersion.cmake.in
    old new  
    3232if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
    3333  set(PACKAGE_VERSION_EXACT TRUE)
    3434endif()
    35 
    36 
    37 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
    38 if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
    39    return()
    40 endif()
    41 
    42 # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
    43 if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
    44   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
    45   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    46   set(PACKAGE_VERSION_UNSUITABLE TRUE)
    47 endif()

  • Modules/BasicConfigVersion-SameMajorVersion.cmake.in 

    diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in
    old new  
    3131      set(PACKAGE_VERSION_EXACT TRUE)
    3232  endif()
    3333endif()
    34 
    35 
    36 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
    37 if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
    38    return()
    39 endif()
    40 
    41 # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
    42 if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
    43   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
    44   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    45   set(PACKAGE_VERSION_UNSUITABLE TRUE)
    46 endif()