[llvm] r361286 - [cmake] Try to make cmake happy and fix bots.

[Don Hinton via llvm-commits]

Hi Cameron:

Sorry about that.  I think I've got it fixed now, as of r361291.  I was
using VERSION_GREATER_EQUAL, but turns out that isn't available prior to
cmake version 3.7.2.

I'm watching the bots, but please let me know if the latest fix doesn't
work for you.

thanks...
don

On Tue, May 21, 2019 at 12:20 PM Cameron McInally <cameron.mcinally at nyu.edu>
wrote:

> Hi Don,
>
> This change seems to have broken my local build. Any ideas?
>
> ```
> CMake Error at cmake/config-ix.cmake:567 (if):
>   if given arguments:
>
>     "CMAKE_GENERATOR" "STREQUAL" "Ninja" "AND" "" "VERSION_GREATER_EQUAL"
> "1.9.0" "AND" "CMAKE_HOST_APPLE" "AND" "CMAKE_HOST_SYSTEM_VERSION"
> "VERSION_GREATER" "15.6.0"
>
>   Unknown arguments specified
> Call Stack (most recent call first):
>   CMakeLists.txt:654 (include)
>
> -- Configuring incomplete, errors occurred!
> ```
>
> Thanks,
> Cam
>
> On Tue, May 21, 2019 at 2:48 PM Don Hinton via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
>
>> Author: dhinton
>> Date: Tue May 21 11:51:21 2019
>> New Revision: 361286
>>
>> URL:
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D361286-26view-3Drev&d=DwIGaQ&c=slrrB7dE8n7gBJbeO0g-IQ&r=O_4M49EtSpZ_-BQYeigzGv0P4__noMcSu2RYEjS1vKs&m=ofcGBHHj9RUrHt-AaraheSp-lrdUKyr-eS56uF75LGg&s=r6rRmERt67hHL0IXpkU_AlHJxghFd8y7_XmFwUVTZ4M&e=
>> Log:
>> [cmake] Try to make cmake happy and fix bots.
>>
>> Modified:
>>     llvm/trunk/cmake/config-ix.cmake
>>
>> Modified: llvm/trunk/cmake/config-ix.cmake
>> URL:
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_cmake_config-2Dix.cmake-3Frev-3D361286-26r1-3D361285-26r2-3D361286-26view-3Ddiff&d=DwIGaQ&c=slrrB7dE8n7gBJbeO0g-IQ&r=O_4M49EtSpZ_-BQYeigzGv0P4__noMcSu2RYEjS1vKs&m=ofcGBHHj9RUrHt-AaraheSp-lrdUKyr-eS56uF75LGg&s=rYjv2Bh7sNtU7QaehRn34MJtAvtdpn8xHXNn3BgLQ-4&e=
>>
>> ==============================================================================
>> --- llvm/trunk/cmake/config-ix.cmake (original)
>> +++ llvm/trunk/cmake/config-ix.cmake Tue May 21 11:51:21 2019
>> @@ -565,7 +565,7 @@ if(CMAKE_GENERATOR STREQUAL "Ninja")
>>  endif()
>>
>>  if(CMAKE_GENERATOR STREQUAL "Ninja" AND
>> -    NINJA_VERSION VERSION_GREATER_EQUAL "1.9.0" AND
>> +    "${NINJA_VERSION}" VERSION_GREATER_EQUAL "1.9.0" AND
>>      CMAKE_HOST_APPLE AND CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER
>> "15.6.0")
>>    set(LLVM_TOUCH_STATIC_LIBRARIES ON)
>>  endif()
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>>
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Dcommits&d=DwIGaQ&c=slrrB7dE8n7gBJbeO0g-IQ&r=O_4M49EtSpZ_-BQYeigzGv0P4__noMcSu2RYEjS1vKs&m=ofcGBHHj9RUrHt-AaraheSp-lrdUKyr-eS56uF75LGg&s=RvddPuYu0rDvB3FcMQ9NmL63J975TZFmodOIlIj7QU0&e=
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190521/229204b7/attachment.html>