From 98b8529d1f0eb52936515152754ded6745075ac4 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 15 Apr 2011 00:20:15 +0000 Subject: [PATCH] Use option() to handle configuration variables, so they will show up in the CMake GUI git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@576 632fc199-4ca6-4c93-a231-07263d6284db --- CMakeLists.txt | 16 +++++----------- configure.ac | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5631bf..ed29f8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,17 +32,11 @@ endif() message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") -if(NOT DEFINED WITH_SIMD) - set(WITH_SIMD 1) -endif() - -if(NOT DEFINED WITH_ARITH_ENC) - set(WITH_ARITH_ENC 1) -endif() - -if(NOT DEFINED WITH_ARITH_DEC) - set(WITH_ARITH_DEC 1) -endif() +option(WITH_SIMD "Include SIMD extensions" TRUE) +option(WITH_ARITH_ENC "Include arithmetic encoding support" TRUE) +option(WITH_ARITH_DEC "Include arithmetic decoding support" TRUE) +option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE) +option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE) if(WITH_ARITH_ENC) set(C_ARITH_CODING_SUPPORTED 1) diff --git a/configure.ac b/configure.ac index ac548a3..10d1880 100644 --- a/configure.ac +++ b/configure.ac @@ -198,7 +198,7 @@ AM_CONDITIONAL([WITH_ARITH], [test "x$with_arith_dec" != "xno" -o "x$with_arith_ # SIMD is optional AC_ARG_WITH([simd], - AC_HELP_STRING([--without-simd],[Omit accelerated SIMD routines.])) + AC_HELP_STRING([--without-simd],[Omit SIMD extensions.])) if test "x${with_simd}" != "xno"; then # Check if we're on a supported CPU AC_MSG_CHECKING([if we have SIMD optimisations for cpu type]) -- 2.40.0