From 31d44f02807a6ce02feead4326e58fac9681c045 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Tue, 20 Sep 2016 18:48:06 +0200 Subject: [PATCH] Disable automatic compilation of t1_generate_luts Fix #831 --- CMakeLists.txt | 3 ++- src/lib/openjp2/CMakeLists.txt | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b187a13..f55be537 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,7 +226,7 @@ CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) include(TestLargeFiles) OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES) -# Allocating Aligned Memory Blocks +# Allocating Aligned Memory Blocks include(CheckIncludeFiles) check_include_files(malloc.h OPJ_HAVE_MALLOC_H) include(CheckSymbolExists) @@ -249,6 +249,7 @@ if(BUILD_JPIP_SERVER) endif() endif() add_subdirectory(src/lib) +option(BUILD_LUTS_GENERATOR "Build utility to generate t1_luts.h" OFF) #----------------------------------------------------------------------------- # Build Applications diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index 014be603..b36905c9 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -118,11 +118,13 @@ install( DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) endif() -# internal utilities to generate t1_luts.h (part of the jp2 lib) +if(BUILD_LUTS_GENERATOR) +# internal utility to generate t1_luts.h (part of the jp2 lib) # no need to install: -add_executable(t1_generate_luts t1_generate_luts.c) -if(UNIX) - target_link_libraries(t1_generate_luts m) + add_executable(t1_generate_luts t1_generate_luts.c) + if(UNIX) + target_link_libraries(t1_generate_luts m) + endif() endif() # Experimental option; let's how cppcheck performs