backport r898 to r907 in openjpeg-1.5 branch

2011-09-01 12:08:10 +00:00
parent e89eb575ac
commit 9a89e2f162
31 changed files with 781 additions and 391 deletions
--- a/applications/JavaOpenJPEG/CMakeLists.txt
+++ b/applications/JavaOpenJPEG/CMakeLists.txt
@@ -4,16 +4,9 @@
 SET(common_SRCS
  ../codec/convert.c
  ../codec/index.c
+  ../common/opj_getopt.c
  )

-# If not getopt was found then add it to the lib:
-IF(DONT_HAVE_GETOPT)
-  SET(common_SRCS
-    ${common_SRCS}
-    ../common/getopt.c
-  )
-ENDIF(DONT_HAVE_GETOPT)
-

 # Headers file are located here:
 INCLUDE_DIRECTORIES(