From 3db502ba47e0332d52e15a7043983a94b2914a1d Mon Sep 17 00:00:00 2001 From: Jakub Stefanski Date: Tue, 6 Oct 2015 14:17:54 +0200 Subject: [PATCH] Fix FindAsciiDoc module for CMake 3 Fixed '(' and ')' braces usage volation according to CMake policy CMP0053 in FindAsciiDoc module. --- builds/cmake/Modules/FindAsciiDoc.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/builds/cmake/Modules/FindAsciiDoc.cmake b/builds/cmake/Modules/FindAsciiDoc.cmake index db4e418c..15063c31 100644 --- a/builds/cmake/Modules/FindAsciiDoc.cmake +++ b/builds/cmake/Modules/FindAsciiDoc.cmake @@ -6,19 +6,22 @@ # A2X_EXECUTABLE - the full path to a2x # A2X_FOUND - If false, don't attempt to use a2x. +# CMP0053: Unable to refer to $ENV{PROGRAMFILES(X86)} +set(PROGRAMFILESX86 "PROGRAMFILES(X86)") + find_program(ASCIIDOC_EXECUTABLE asciidoc asciidoc.py PATHS "$ENV{ASCIIDOC_ROOT}" "$ENV{PROGRAMW6432}/asciidoc" "$ENV{PROGRAMFILES}/asciidoc" - "$ENV{PROGRAMFILES(X86)}/asciidoc") + "$ENV{${PROGRAMFILESX86}}/asciidoc") find_program(A2X_EXECUTABLE a2x PATHS "$ENV{ASCIIDOC_ROOT}" "$ENV{PROGRAMW6432}/asciidoc" "$ENV{PROGRAMFILES}/asciidoc" - "$ENV{PROGRAMFILES(X86)}/asciidoc") + "$ENV{${PROGRAMFILESX86}}/asciidoc") include(FindPackageHandleStandardArgs) find_package_handle_standard_ARGS(AsciiDoc REQUIRED_VARS ASCIIDOC_EXECUTABLE) -mark_as_advanced(ASCIIDOC_EXECUTABLE A2X_EXECUTABLE) \ No newline at end of file +mark_as_advanced(ASCIIDOC_EXECUTABLE A2X_EXECUTABLE)