liborigin-devel

[Liborigin-devel] [PATCH 5/5] Update README build instructions for use with CMake

[Miquel G. <gbm...@gm...>]

---
 README |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README b/README
index b28dfa5..098520c 100644
--- a/README
+++ b/README
@@ -17,13 +17,15 @@ DEPENDENCIES: to compile, liborigin2 (still) depends on
 		Note that the BOOST libraries are not needed at run time,
 		neither are linked in the executable.
 ---------------------------------------------------------------------------
-COMPILING: liborigin2 uses qmake for the building process.
-		qmake is part of a Qt distribution: http://trolltech.com/
+COMPILING: liborigin2 uses CMake for the building process.
+		CMake is available at http://www.cmake.org/

-After installing qmake and the BOOST C++ library headers on your
system, issue the following commands:
-	$ qmake
+After installing CMake and the BOOST C++ library headers on your
system, issue the following commands:
+	$ mkdir build
+	$ cd build
+	$ cmake ../
 	$ make
-	$ make staticlib
+	$ make install

 ---------------------------------------------------------------------------
 FEATURES :
-- 
1.7.3

Re: [Liborigin-devel] [PATCH 5/5] Update README build instructions for use with CMake

[Knut F. <Knu...@gm...>]

[2010-11-05 00:13] Miquel Garriga <gbm...@gm...>:
> ---
>  README |   12 +++++++-----
>  1 files changed, 7 insertions(+), 5 deletions(-)

I think we can squash this with the previous patch (switch from qmake to 
CMake), since the two make relatively little sense on their own.

Knut

Re: [Liborigin-devel] [PATCH 5/5] Update README build instructions for use with CMake

[Knut F. <Knu...@gm...>]

I've committed your patches, except for 1 (in the hope that we can agree not 
to maintain two repositories) and 2 (since I think it makes little sense to 
update the version number somewhere between releases).

With both opj2dat and CMake buildfile (from the days of liborigin1) back in 
place, I think we have a good basis for the next big changes. :-)

One thing we still need to figure out is the best procedure for submitting 
patches; copy-pasting them to an email client can easily break them:

[2010-11-05 00:13] Miquel Garriga <gbm...@gm...>:
> diff --git a/README b/README
[...]
> +		CMake is available at http://www.cmake.org/
> 
  ^ leading space (diff format) was missing from empty context lines...

> -After installing qmake and the BOOST C++ library headers on your
> system, issue the following commands:
... and long lines got word-wrapped.

I had to manually edit the patches to fix these, which could get tedious for 
larger patches. Maybe you can teach your mail client not to munge the patches, 
or you could try git send-email (git help send-email even has a section 
explaining how to set it up for gmail).

Knut