From 5b1b3b56d3df906d7e26a8dfca6da9da74571cce Mon Sep 17 00:00:00 2001 From: Telford Berkey Date: Tue, 9 Dec 2014 10:33:15 -0500 Subject: [PATCH] Updated Cmake file to remove ascii doc. --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 721d1332..0708a167 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,9 +266,14 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") add_definitions(-D_DARWIN_C_SOURCE) endif() -set(CMAKE_PYTHON_VERSION 2.7 2.6 2.5 2.4) -find_package(PythonInterp) -find_package(AsciiDoc) +if(NOT WITHOUT_ASCIIDOC) + set(CMAKE_PYTHON_VERSION 2.7 2.6 2.5 2.4) + find_package(PythonInterp) + find_package(AsciiDoc) +else() + set(PYTHON_FOUND OFF) + set(ASCIIDOC_FOUND OFF) +endif() cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires DocBook)" ON "PYTHON_FOUND;ASCIIDOC_FOUND" OFF) @@ -336,9 +341,6 @@ if(NOT CMAKE_BUILD_TYPE) FORCE) endif() -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) -set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib) - #----------------------------------------------------------------------------- # platform specifics