From 3f84e108699d50ba5a6f133c46f015633f7dfe1f Mon Sep 17 00:00:00 2001 From: Florian Rathgeber Date: Thu, 10 Nov 2016 18:40:18 +0000 Subject: [PATCH] ECC-380 Do not link OpenJPEG in Python extension module --- python/CMakeLists.txt | 4 ---- python/setup.py.in | 7 ------- 2 files changed, 11 deletions(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 062ed397a..9cc933516 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -10,10 +10,6 @@ if( HAVE_PYTHON ) get_filename_component(JASPER_DIR ${JASPER_INCLUDE_DIR} PATH ) endif() - if( HAVE_LIBOPENJPEG ) - get_filename_component(OPENJPEG_LIB_DIR ${OPENJPEG_LIBRARY} PATH ) - endif() - if( HAVE_AEC ) get_filename_component(AEC_DIR ${AEC_INCLUDE_DIR} PATH ) endif() diff --git a/python/setup.py.in b/python/setup.py.in index 990897cbe..f99403054 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -36,13 +36,6 @@ if shared_libs == 'OFF': runtime_library_dirs=os.path.join(jasper_dir, 'lib')) add_attribute(libraries='jasper') - if @HAVE_LIBOPENJPEG@: - openjpeg_lib_dir = '@OPENJPEG_LIB_DIR@' - if openjpeg_lib_dir: - add_attribute(library_dirs=openjpeg_lib_dir, - runtime_library_dirs=openjpeg_lib_dir) - add_attribute(libraries='openjp2') - # assumes png is supplied by system paths -- may not be true if @HAVE_LIBPNG@: add_attribute(libraries='png')