From: Antonin Descampe <antonin@gmail.com>
Date: Wed, 7 Jul 2010 13:00:39 +0000 (+0000)
Subject: Update README and Makefiles to promote cmake. Fix the README.cmake file.
X-Git-Tag: version.1.4~77
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=94b9942cd9152cd5a99cc26e3a3d1b25f2f8e4b4;p=openjpeg.git

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

diff --git a/Makefile b/Makefile
index 9a472557..533e65a3 100644
--- 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 05349148..fcccc73f 100644
--- 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 2079bd48..a995157b 100644
--- 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 677e2d8d..072d1c13 100644
--- 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 e99eccbc..a2e1c27b 100644
--- 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.