Update README and Makefiles to promote cmake. Fix the README.cmake file.

diff --git a/Makefile b/Makefile
index 9a47255708d55151cc5f0e1f1c4d98704be5c075..533e65a324af525ba104419b6a02cc02903c9b13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,11 @@
+
+# ************************************************
+# NOTE : This Makefile is not maintained anymore.
+# Please use the cmake tool (see README.cmake) to
+# generate the right Makefile for your platform.
+# ************************************************
+
+
 # Linux makefile for OpenJPEG
 
 VER_MAJOR = 2

diff --git a/Makefile.osx b/Makefile.osx
index 05349148b9465ce78aaad74fe3836323b76d5af6..fcccc73fd56d3953e149e8837d53aa28ac479d34 100644 (file)
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -1,3 +1,11 @@
+
+# ************************************************
+# NOTE : This Makefile is not maintained anymore.
+# Please use the cmake tool (see README.cmake) to
+# generate the right Makefile for your platform.
+# ************************************************
+
+
 # MacOSX makefile for OpenJPEG
 
 VER_MAJOR = 2

diff --git a/README.cmake b/README.cmake
index 2079bd482439b921738b96d6854a04148aa9874c..a995157be274a59a4deedc9835a487b391fa534f 100644 (file)
--- a/README.cmake
+++ b/README.cmake
@@ -1,9 +1,18 @@
 Basic instructions on how to build using CMake (CMake 2.4.5 or newer is required)
 
-  svn co http://www.openjpeg.org/svn/trunk
-  cd trunk
-  mkdir bin
-  cd bin
-  cmake .. -DBUILD_EXAMPLES:BOOL=ON
+  svn co http://openjpeg.googlecode.com/svn/trunk openjpeg-read-only
+  cd openjpeg-read-only
+  cmake -G "Unix Makefiles"
   make
-  ./bin/j2k_to_image 
+  ./bin/j2k_to_image
+       
+For MacOSX users, if instructions above fail, try to add "-DCMAKE_OSX_ARCHITECTURES:STRING=i386" to the cmake command above.
+       
+To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG) : 
+
+       svn co http://openjpeg.googlecode.com/svn/trunk openjpeg-read-only
+  cd openjpeg-read-only
+  cmake -G "Unix Makefiles" -DBUILD_TESTING:BOOL=ON -DJPEG2000_CONFORMANCE_DATA_ROOT:PATH=/path/to/your/JPEG2000/test/files
+  make Experimental
+
+Note : JPEG2000 test files are available here : http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
\ No newline at end of file

diff --git a/README.linux b/README.linux
index 677e2d8d3b94eb2bfd7291cc8c47d184d6b5e5df..072d1c13a67bc2a51e89ef4c91a48fe7eec629ed 100644 (file)
--- a/README.linux
+++ b/README.linux
@@ -1,3 +1,11 @@
+
+# **************************************************
+# NOTE : This README is obsolete. We strongly
+# recommend using the cmake tool (see README.cmake)
+# to build openJPEG.
+# **************************************************
+
+
 Release Notes
 --------------
 This version of the library has been tested under the following OS:

diff --git a/README.osx b/README.osx
index e99eccbce4aaf3a913f7e74f4e71e829db540370..a2e1c27b4788342d1ce9584547e7a7b3698c71eb 100644 (file)
--- a/README.osx
+++ b/README.osx
@@ -1,3 +1,11 @@
+
+# **************************************************
+# NOTE : This README is obsolete. We strongly
+# recommend using the cmake tool (see README.cmake)
+# to build openJPEG.
+# **************************************************
+
+
 Release Notes
 --------------
 This version of the library has been tested under OSX 10.3 using gcc 3.3.