Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am 15.02.2020 um 09:28 schrieb Kornel Benko : > > Am Sat, 15 Feb 2020 09:17:53 +0100 > schrieb Kornel Benko : > >> Am Sat, 15 Feb 2020 09:02:45 +0100 >> schrieb Stephan Witt : >> >>> Am 15.02.2020 um 08:32 schrieb Kornel Benko : Am Fri, 14 Feb 2020 17:37:28 +0100 schrieb Stephan Witt : > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git checkout -- ..." 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 -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am Sat, 15 Feb 2020 09:17:53 +0100 schrieb Kornel Benko : > Am Sat, 15 Feb 2020 09:02:45 +0100 > schrieb Stephan Witt : > > > Am 15.02.2020 um 08:32 schrieb Kornel Benko : > > > > > > Am Fri, 14 Feb 2020 17:37:28 +0100 > > > schrieb Stephan Witt : > > > > > >> Changes not staged for commit: > > >> (use "git add ..." to update what will be committed) > > >> (use "git checkout -- ..." 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) I could remove the wrong one, but what would happen on your side? Kornel pgpmuLjQi47aG.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am Sat, 15 Feb 2020 09:02:45 +0100 schrieb Stephan Witt : > Am 15.02.2020 um 08:32 schrieb Kornel Benko : > > > > Am Fri, 14 Feb 2020 17:37:28 +0100 > > schrieb Stephan Witt : > > > >> Changes not staged for commit: > >> (use "git add ..." to update what will be committed) > >> (use "git checkout -- ..." 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 pgpp2r3Mv5vuv.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am 15.02.2020 um 08:32 schrieb Kornel Benko : > > Am Fri, 14 Feb 2020 17:37:28 +0100 > schrieb Stephan Witt : > >> Changes not staged for commit: >> (use "git add ..." to update what will be committed) >> (use "git checkout -- ..." 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. 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 -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am Fri, 14 Feb 2020 17:37:28 +0100 schrieb Stephan Witt : > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git checkout -- ..." 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 ? Kornel pgp2m4rBT00Zd.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am 14.02.2020 um 17:22 schrieb Stephan Witt : > > Am 14.02.2020 um 16:44 schrieb Kornel Benko : >> >> Am Fri, 14 Feb 2020 15:57:45 +0100 >> schrieb Stephan Witt : >> >>> Am 08.02.2020 um 21:55 schrieb Kornel Benko : commit a47dec6b4a91ca59a8d9d4431ecedd77f8ffc7e7 Author: Kornel Benko Date: Mon Jan 27 10:44:14 2020 +0100 Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs() (cherry picked from commit 9fdc00fe2a2b2db752ca244eac3d14e708d5caba) --- CMakeLists.txt |2 +- development/cmake/modules/FindENCHANT.cmake | 22 ++ development/cmake/modules/FindHUNSPELL.cmake | 21 + 3 files changed, 44 insertions(+), 1 deletions(-) >>> >>> Hi Kornel, >>> >>> I don’t know how this goes on Windows. But on Mac this breaks for checkouts >>> in file systems with case insensitive file names. At least I have problems >>> to switch between master and 2.3.x branch now. >>> >>> I don’t know how to proceed. Do you have an idea? >> >> I use a 'git clone'-dir for 2.3.x That’s the protocol of a clean clone process: == $ git clone g...@git.lyx.org:lyx lyx-2.3.x Cloning into 'lyx-2.3.x'... remote: Counting objects: 459413, done. remote: Compressing objects: 100% (73785/73785), done. remote: Total 459413 (delta 386809), reused 456042 (delta 383995) Receiving objects: 100% (459413/459413), 428.32 MiB | 3.66 MiB/s, done. Resolving deltas: 100% (386809/386809), done. Checking out files: 100% (7263/7263), 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: 'development/cmake/modules/FindENCHANT.cmake' 'development/cmake/modules/FindEnchant.cmake' 'development/cmake/modules/FindHUNSPELL.cmake' 'development/cmake/modules/FindHunspell.cmake' $ (cd lyx-2.3.x;git checkout 2.3.x) Checking out files: 100% (3325/3325), done. Branch '2.3.x' set up to track remote branch '2.3.x' from 'origin'. Switched to a new branch '2.3.x' $ (cd lyx-2.3.x;git status) On branch 2.3.x Your branch is up to date with 'origin/2.3.x'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." 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. Stephan > > I have a separate checkout too. But there it is the same. > >> Here I use normally >> git fetch >> git stash clear >> git stash save --include-untracked >> git pull --rebase >> git stash pop > > Normally I don’t like to loose my stash. > >> >>> error: cannot pull with rebase: You have unstaged changes. >>> error: please commit or stash them. >>> >>> $ (cd development/cmake/modules ;ls -l ) >>> total 288 >> >> Does this help? > > No. Unfortunately not. > > Stephan > > -- > lyx-devel mailing list > lyx-devel@lists.lyx.org > http://lists.lyx.org/mailman/listinfo/lyx-devel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am 14.02.2020 um 16:44 schrieb Kornel Benko : > > Am Fri, 14 Feb 2020 15:57:45 +0100 > schrieb Stephan Witt : > >> Am 08.02.2020 um 21:55 schrieb Kornel Benko : >>> >>> commit a47dec6b4a91ca59a8d9d4431ecedd77f8ffc7e7 >>> Author: Kornel Benko >>> Date: Mon Jan 27 10:44:14 2020 +0100 >>> >>> Cmake build: Remove cmake warnings about mismatched values of >>> FindPackageHandleStandardArgs() >>> >>> (cherry picked from commit 9fdc00fe2a2b2db752ca244eac3d14e708d5caba) >>> --- >>> CMakeLists.txt |2 +- >>> development/cmake/modules/FindENCHANT.cmake | 22 ++ >>> development/cmake/modules/FindHUNSPELL.cmake | 21 + >>> 3 files changed, 44 insertions(+), 1 deletions(-) >> >> Hi Kornel, >> >> I don’t know how this goes on Windows. But on Mac this breaks for checkouts >> in file systems with case insensitive file names. At least I have problems >> to switch between master and 2.3.x branch now. >> >> I don’t know how to proceed. Do you have an idea? > > I use a 'git clone'-dir for 2.3.x I have a separate checkout too. But there it is the same. > Here I use normally > git fetch > git stash clear > git stash save --include-untracked > git pull --rebase > git stash pop Normally I don’t like to loose my stash. > >> error: cannot pull with rebase: You have unstaged changes. >> error: please commit or stash them. >> >> $ (cd development/cmake/modules ;ls -l ) >> total 288 > > Does this help? No. Unfortunately not. Stephan -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am Fri, 14 Feb 2020 15:57:45 +0100 schrieb Stephan Witt : > Am 08.02.2020 um 21:55 schrieb Kornel Benko : > > > > commit a47dec6b4a91ca59a8d9d4431ecedd77f8ffc7e7 > > Author: Kornel Benko > > Date: Mon Jan 27 10:44:14 2020 +0100 > > > >Cmake build: Remove cmake warnings about mismatched values of > > FindPackageHandleStandardArgs() > > > >(cherry picked from commit 9fdc00fe2a2b2db752ca244eac3d14e708d5caba) > > --- > > CMakeLists.txt |2 +- > > development/cmake/modules/FindENCHANT.cmake | 22 ++ > > development/cmake/modules/FindHUNSPELL.cmake | 21 + > > 3 files changed, 44 insertions(+), 1 deletions(-) > > Hi Kornel, > > I don’t know how this goes on Windows. But on Mac this breaks for checkouts > in file systems with case insensitive file names. At least I have problems > to switch between master and 2.3.x branch now. > > I don’t know how to proceed. Do you have an idea? I use a 'git clone'-dir for 2.3.x > Stephan > > The protocol of my terminal session is as follows: > > $ git checkout -f master > Checking out files: 100% (3326/3326), done. > Switched to branch 'master' > Your branch is up to date with 'origin/master‘. > $ git status > On branch master > Your branch is up to date with 'origin/master'. > > nothing to commit, working tree clean > > $ (cd development/cmake/modules ;ls -l) > total 288 > -rw-r--r-- 1 stephan staff 3908 27 Dez 2018 FindASPELL.cmake > -rw-r--r-- 1 stephan staff 1071 27 Dez 2018 FindAiksaurusLIB.cmake > -rw-r--r-- 1 stephan staff 4233 27 Dez 2018 FindCXX11Compiler.cmake > -rw-r--r-- 1 stephan staff682 10 Feb 11:30 FindENCHANT.cmake > -rw-r--r-- 1 stephan staff 1322 27 Dez 2018 FindGNUWIN32.cmake > -rw-r--r-- 1 stephan staff741 14 Feb 15:52 FindHunspell.cmake > -rw-r--r-- 1 stephan staff 3891 14 Feb 15:52 FindICONV.cmake > -rwxr-xr-x 1 stephan staff 3239 27 Dez 2018 FindLyXGettext.cmake > -rw-r--r-- 1 stephan staff 2516 27 Dez 2018 FindMagic.cmake > -rw-r--r-- 1 stephan staff777 27 Dez 2018 FindMyThesLIB.cmake > -rw-r--r-- 1 stephan staff 4775 27 Dez 2018 FindOpenSSL.cmake > -rw-r--r-- 1 stephan staff 38254 27 Dez 2018 FindQt4.cmake > -rw-r--r-- 1 stephan staff 1418 27 Dez 2018 FindZLIB.cmake > -rw-r--r-- 1 stephan staff 2801 27 Dez 2018 LyXDestinations.cmake > -rw-r--r-- 1 stephan staff 14119 14 Feb 15:52 LyXMacros.cmake > -rw-r--r-- 1 stephan staff 3830 22 Aug 16:32 LyXPaths.cmake > -rw-r--r-- 1 stephan staff 2067 27 Dez 2018 LyXuic.cmake > -rw-r--r-- 1 stephan staff651 27 Dez 2018 MacroBoolTo01.cmake > -rw-r--r-- 1 stephan staff 10691 27 Dez 2018 PCHSupport_26.cmake > -rw-r--r-- 1 stephan staff 2144 27 Dez 2018 ProjectSourceGroup.cmake > > > $ git checkout -f 2.3.x > Checking out files: 100% (3325/3325), done. > Switched to branch '2.3.x' > Your branch is behind 'origin/2.3.x' by 3 commits, and can be fast-forwarded. > (use "git pull" to update your local branch) > $ git status > On branch 2.3.x > Your branch is behind 'origin/2.3.x' by 3 commits, and can be fast-forwarded. > (use "git pull" to update your local branch) > > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git checkout -- ..." 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“) > $ git pull --rebase > Unstaged changes after reset: > M development/cmake/modules/FindHunspell.cmake Here I use normally git fetch git stash clear git stash save --include-untracked git pull --rebase git stash pop > error: cannot pull with rebase: You have unstaged changes. > error: please commit or stash them. > > $ (cd development/cmake/modules ;ls -l ) > total 288 Does this help? Kornel pgpmkbt1X_QUY.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/2.3.x] Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()
Am 08.02.2020 um 21:55 schrieb Kornel Benko : > > commit a47dec6b4a91ca59a8d9d4431ecedd77f8ffc7e7 > Author: Kornel Benko > Date: Mon Jan 27 10:44:14 2020 +0100 > >Cmake build: Remove cmake warnings about mismatched values of > FindPackageHandleStandardArgs() > >(cherry picked from commit 9fdc00fe2a2b2db752ca244eac3d14e708d5caba) > --- > CMakeLists.txt |2 +- > development/cmake/modules/FindENCHANT.cmake | 22 ++ > development/cmake/modules/FindHUNSPELL.cmake | 21 + > 3 files changed, 44 insertions(+), 1 deletions(-) Hi Kornel, I don’t know how this goes on Windows. But on Mac this breaks for checkouts in file systems with case insensitive file names. At least I have problems to switch between master and 2.3.x branch now. I don’t know how to proceed. Do you have an idea? Stephan The protocol of my terminal session is as follows: $ git checkout -f master Checking out files: 100% (3326/3326), done. Switched to branch 'master' Your branch is up to date with 'origin/master‘. $ git status On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean $ (cd development/cmake/modules ;ls -l) total 288 -rw-r--r-- 1 stephan staff 3908 27 Dez 2018 FindASPELL.cmake -rw-r--r-- 1 stephan staff 1071 27 Dez 2018 FindAiksaurusLIB.cmake -rw-r--r-- 1 stephan staff 4233 27 Dez 2018 FindCXX11Compiler.cmake -rw-r--r-- 1 stephan staff682 10 Feb 11:30 FindENCHANT.cmake -rw-r--r-- 1 stephan staff 1322 27 Dez 2018 FindGNUWIN32.cmake -rw-r--r-- 1 stephan staff741 14 Feb 15:52 FindHunspell.cmake -rw-r--r-- 1 stephan staff 3891 14 Feb 15:52 FindICONV.cmake -rwxr-xr-x 1 stephan staff 3239 27 Dez 2018 FindLyXGettext.cmake -rw-r--r-- 1 stephan staff 2516 27 Dez 2018 FindMagic.cmake -rw-r--r-- 1 stephan staff777 27 Dez 2018 FindMyThesLIB.cmake -rw-r--r-- 1 stephan staff 4775 27 Dez 2018 FindOpenSSL.cmake -rw-r--r-- 1 stephan staff 38254 27 Dez 2018 FindQt4.cmake -rw-r--r-- 1 stephan staff 1418 27 Dez 2018 FindZLIB.cmake -rw-r--r-- 1 stephan staff 2801 27 Dez 2018 LyXDestinations.cmake -rw-r--r-- 1 stephan staff 14119 14 Feb 15:52 LyXMacros.cmake -rw-r--r-- 1 stephan staff 3830 22 Aug 16:32 LyXPaths.cmake -rw-r--r-- 1 stephan staff 2067 27 Dez 2018 LyXuic.cmake -rw-r--r-- 1 stephan staff651 27 Dez 2018 MacroBoolTo01.cmake -rw-r--r-- 1 stephan staff 10691 27 Dez 2018 PCHSupport_26.cmake -rw-r--r-- 1 stephan staff 2144 27 Dez 2018 ProjectSourceGroup.cmake $ git checkout -f 2.3.x Checking out files: 100% (3325/3325), done. Switched to branch '2.3.x' Your branch is behind 'origin/2.3.x' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) $ git status On branch 2.3.x Your branch is behind 'origin/2.3.x' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." 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“) $ git pull --rebase Unstaged changes after reset: M development/cmake/modules/FindHunspell.cmake error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them. $ (cd development/cmake/modules ;ls -l ) total 288 -rw-r--r-- 1 stephan staff 3908 27 Dez 2018 FindASPELL.cmake -rw-r--r-- 1 stephan staff 1071 27 Dez 2018 FindAiksaurusLIB.cmake -rw-r--r-- 1 stephan staff 4233 27 Dez 2018 FindCXX11Compiler.cmake -rw-r--r-- 1 stephan staff682 10 Feb 11:30 FindENCHANT.cmake -rw-r--r-- 1 stephan staff 1322 27 Dez 2018 FindGNUWIN32.cmake -rw-r--r-- 1 stephan staff551 14 Feb 15:54 FindHunspell.cmake -rw-r--r-- 1 stephan staff 4036 14 Feb 15:54 FindICONV.cmake -rwxr-xr-x 1 stephan staff 3239 27 Dez 2018 FindLyXGettext.cmake -rw-r--r-- 1 stephan staff 2516 27 Dez 2018 FindMagic.cmake -rw-r--r-- 1 stephan staff777 27 Dez 2018 FindMyThesLIB.cmake -rw-r--r-- 1 stephan staff 4775 27 Dez 2018 FindOpenSSL.cmake -rw-r--r-- 1 stephan staff 38254 27 Dez 2018 FindQt4.cmake -rw-r--r-- 1 stephan staff 1418 27 Dez 2018 FindZLIB.cmake -rw-r--r-- 1 stephan staff 2801 27 Dez 2018 LyXDestinations.cmake -rw-r--r-- 1 stephan staff 14115 14 Feb 15:54 LyXMacros.cmake -rw-r--r-- 1 stephan staff 3830 22 Aug 16:32 LyXPaths.cmake -rw-r--r-- 1 stephan staff 2067 27 Dez 2018 LyXuic.cmake -rw-r--r-- 1 stephan staff651 27 Dez 2018 MacroBoolTo01.cmake -rw-r--r-- 1 stephan staff 10691 27 Dez 2018 PCHSupport_26.cmake -rw-r--r-- 1 stephan staff 2144 27 Dez 2018 ProjectSourceGroup.cmake -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
