From ff72d131edc40dc4b2c939df08f913bdf33216a3 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Tue, 1 Apr 2014 13:40:41 +0000 Subject: [PATCH] [1.5] Rework r2827. getopt was still being used in java binding Update issue 301 --- applications/JavaOpenJPEG/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/JavaOpenJPEG/CMakeLists.txt b/applications/JavaOpenJPEG/CMakeLists.txt index db8f4ef5..0554c1d0 100644 --- a/applications/JavaOpenJPEG/CMakeLists.txt +++ b/applications/JavaOpenJPEG/CMakeLists.txt @@ -7,8 +7,12 @@ SET(openjpegjni_SRCS ${OPENJPEG_SOURCE_DIR}/applications/codec/index.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c #${OPENJPEG_SOURCE_DIR}/applications/common/color.c - ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c ) +if(NOT USE_SYSTEM_GETOPT) + list(APPEND openjpegjni_SRCS + ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c + ) +endif() # JNI binding: find_package(JNI REQUIRED)