On 8/3/21 10:05 PM, Soumya Koduri wrote:
Hi,
On 8/3/21 1:40 AM, Patrick Donnelly wrote:
I think a secondary SQLite module was added in:
https://github.com/ceph/ceph/commit/67be96413d606b4cdb7497d58eb93ec0c2ea66cb
Soumya, any reason why this wasn't consolidated with
https://github.com/ceph/ceph/blob/67be96413d606b4cdb7497d58eb93ec0c2ea66cb/cmake/modules/FindSQLite3.cmake
When this feature was being worked upon (PR#31454) more than an year
ago, there was no cmake module added for SQLite3. Rebase over multiple
iterations never gave any warning or conflict with the above cmake
file added later and hence haven't noticed it. Apologies for any
inconvenience caused. I will revert the new module addition changes asap.
Submitted PR#42614 to fix this.
Thanks,
Soumya
[1] https://github.com/ceph/ceph/pull/42614
Thanks,
Soumya
?
On Mon, Aug 2, 2021 at 1:03 PM Anthony D'Atri
<anthony.datri@xxxxxxxxx> wrote:
https://github.com/ceph/ceph/blob/master/cmake/modules/FindSQLITE3.cmake
I think this has complicated the repository. When cloning or
performing other operations on macOS I get a collision with
FindSQLite3.cmake. While Apple's quirky ideas around filename case
are regrettable, I suggest that this file should be reconciled with
the existing and different file whose name is casified differently.
Cloning into 'ceph'...
remote: Enumerating objects: 1057640, done.
remote: Counting objects: 100% (1100/1100), done.
remote: Compressing objects: 100% (616/616), done.
remote: Total 1057640 (delta 695), reused 737 (delta 478),
pack-reused 1056540
Receiving objects: 100% (1057640/1057640), 512.25 MiB | 21.29 MiB/s,
done.
Resolving deltas: 100% (844234/844234), done.
Checking out files: 100% (10770/10770), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:
'cmake/modules/FindSQLITE3.cmake'
'cmake/modules/FindSQLite3.cmake'
[lovecraft:~/git] aad%```
[lovecraft:~/git/ceph] aad% git status
On branch master
Your branch is up to date with 'origin/master'.
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: cmake/modules/FindSQLite3.cmake
no changes added to commit (use "git add" and/or "git commit -a”)
[lovecraft:~/git] aad% git clone https://github.com/ceph/ceph.git
Cloning into 'ceph'...
remote: Enumerating objects: 1057640, done.
remote: Counting objects: 100% (1100/1100), done.
remote: Compressing objects: 100% (616/616), done.
remote: Total 1057640 (delta 695), reused 737 (delta 478),
pack-reused 1056540
Receiving objects: 100% (1057640/1057640), 512.25 MiB | 21.29 MiB/s,
done.
Resolving deltas: 100% (844234/844234), done.
Checking out files: 100% (10770/10770), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:
'cmake/modules/FindSQLITE3.cmake'
'cmake/modules/FindSQLite3.cmake'
[lovecraft:~/git] aad%
_______________________________________________
Dev mailing list -- dev@xxxxxxx
To unsubscribe send an email to dev-leave@xxxxxxx
_______________________________________________
Dev mailing list -- dev@xxxxxxx
To unsubscribe send an email to dev-leave@xxxxxxx
