On 9 June 2015 at 15:55, Peter Kelly <pmke...@apache.org> wrote: > I recommend reading http://git-scm.com/book/en/v2 if you haven’t already… > this was my introduction to git and it make a lot of concept very clear, > relative to the horrible user interface of the command-line tool. > > Regarding the add_subdirectory(consumers/corinthia/src) line in the > CMakeLists.txt, I deliberately uncommented this in order to encourage the > building of the Qt-based desktop editor to be seen as a normal thing, as I > think this is quite an important part of the project and will likely be the > main thing that end-users “see” of the Corinthia. You can of course disable > it for your own purposes if you wish, but I think making further > development of the Qt app one of our main priorities would help a lot in > getting the project ready for our first release (and a milestone on the > path to eventual graduation to a TLP).6 >
I agree with peter, and I use that line in my continued strugle with 64bit windows. rgds jan i. > > — > Dr Peter M. Kelly > pmke...@apache.org > > PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key> > (fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966) > > > On 9 Jun 2015, at 2:44 pm, Ian C <i...@amham.net> wrote: > > > > Hi, > > > > I am a relative git newbie, and have I think goofed up my code tree. I > > merged Gabriela's branch rather than fetching it. So my world is kind of > > confused, > > > > Apart from saving my files, restarting and then importing my files is > there > > anything else I can do? > > > > And FYI my build didn't work due to a line CMakeList.txt > > > > I looked through its history and removed > > > > add_subdirectory(consumers/corinthia/src) > > > > And all was well. > > > > Don't understand the details. With the above line it was complaining > about > > qt5 related paths. > > > > May be a consequence of my goofed git state? > > > > -- > > Cheers, > > > > Ian C > >
