[LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Stephan Witt
st.witt at gmx.net
Sat Feb 15 09:50:06 UTC 2020
Am 15.02.2020 um 09:28 schrieb Kornel Benko <kornel at lyx.org>:
>
> Am Sat, 15 Feb 2020 09:17:53 +0100
> schrieb Kornel Benko <kornel at lyx.org>:
>
>> Am Sat, 15 Feb 2020 09:02:45 +0100
>> schrieb Stephan Witt <st.witt at gmx.net>:
>>
>>> Am 15.02.2020 um 08:32 schrieb Kornel Benko <kornel at lyx.org>:
>>>>
>>>> Am Fri, 14 Feb 2020 17:37:28 +0100
>>>> schrieb Stephan Witt <st.witt at gmx.net>:
>>>>
>>>>> Changes not staged for commit:
>>>>> (use "git add <file>..." to update what will be committed)
>>>>> (use "git checkout -- <file>..." to discard changes in working directory)
>>>>>
>>>>> modified: development/cmake/modules/FindHUNSPELL.cmake
>>>>>
>>>>> no changes added to commit (use "git add" and/or "git commit -a“)
>>>>> ==================
>>>>>
>>>>> No luck. I’d guess on Windows with case insensitive FS it’s the same.
>>>>>
>>>>
>>>> Should it be not enough to say here:
>>>> git checkout development/cmake/modules/FindHUNSPELL.cmake
>>>> git checkout development/cmake/modules/FindENCHANT.cmake
>>>> ?
>>>
>>> No. I‘ve tried this already.
>>>
>>> IMO you can’t have two files with different cases in name only. Didn’t you add a
>>> second one instead of rename it? Actually there’s a problem because it’s duplicated
>>> and changed.
>>
>> No, I did 'git mv'.
>>
>> Possibly it is better to
>> git rm; git commit
>> git add; git commit;
>>
>>> I can rename it on my end. But I don’t know what happens on your side when I push the
>>> change.
>>
>>
>>> I‘ll try to post the diffs later.
>>>
>>> Another option is: you remove the misnamed duplicates from git if they’re present on
>>> your side.
>>>
>>> Stephan
>>>
>>
>> Kornel
>>
>
>
> I see now, that the cherry-pick went probably wrong at 2.3.x, because I have now two
> pairs. (With and without the case diff)
Yes, that’s the problem.
> I could remove the wrong one, but what would happen on your side?
And now it’s ok again. Although I had to drop my experimental clone.
But fortunately with a fresh one I can switch to 2,3,x branch again.
Stephan
More information about the lyx-devel
mailing list