From 47df5fddbc8a486132fde55ef82a76f6bc59e483 Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Thu, 19 Mar 2015 16:32:19 +0100 Subject: [PATCH] Issue #188 - Add some user config items --- CMakeLists.txt | 11 +++++++++++ build/win64/build-me.bat | 2 ++ version.txt | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ede7483..268b89f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,17 @@ add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 ) add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 ) add_definitions ( -DLIBTIDY_VERSION="${LIBTIDY_VERSION}" ) +# Issue #188 - Support user items in platform.h +if (TIDY_CONFIG_FILE) + add_definitions( -DTIDY_CONFIG_FILE="${TIDY_CONFIG_FILE}" ) +endif () +if (TIDY_USER_CONFIG_FILE) + add_definitions( -DTIDY_USER_CONFIG_FILE="${TIDY_USER_CONFIG_FILE}" ) +endif () +if (SUPPORT_GETPWNAM) + add_definitions( -DSUPPORT_GETPWNAM=1 ) +endif () + if(BUILD_SHARED_LIB) set(LIB_TYPE SHARED) message("*** Building DLL library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") diff --git a/build/win64/build-me.bat b/build/win64/build-me.bat index 7e3bdff..396bd16 100644 --- a/build/win64/build-me.bat +++ b/build/win64/build-me.bat @@ -41,6 +41,8 @@ @REM set TMPINST=F:\Projects\software.x64 @set TMPOPTS=-DCMAKE_INSTALL_PREFIX=%TMPINST% @set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64" +@REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg" +@REM set TMPOPTS=%TMPOPTS% -DTIDY_USER_CONFIG_FILE="C:\MDOS\tidy5.cfg" :RPT @if "%~1x" == "x" goto GOTCMD diff --git a/version.txt b/version.txt index 8a4e3a6..422431d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -4.9.21 \ No newline at end of file +4.9.22 \ No newline at end of file