commit 1dad4248e4733212a57944c55a0bd9fdd56ff25a parent 2572f76c857eaaa0789aa0c7f9c844fd83d5383c Author: Vincent Forest <vincent.forest@meso-star.com> Date: Wed, 24 May 2017 09:46:20 +0200 Rename the MAN cmake variable in SOLSTICE_DOC Diffstat:
| M | cmake/CMakeLists.txt | | | 16 | +++++++++++----- |
| M | cmake/doc/CMakeLists.txt | | | 4 | ++-- |
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -20,13 +20,19 @@ enable_testing() option(NO_TEST "Do not build tests" OFF) if(CMAKE_HOST_UNIX) - set(MAN "TROFF & HTML" CACHE STRING "Man pages to generate and install.") - set_property(CACHE MAN PROPERTY STRINGS "HTML" "TROFF" "TROFF & HTML" "NONE") + set(SOLSTICE_DOC "TROFF & HTML" CACHE STRING + "Type of documentation to generate and install.") else() - set(MAN "HTML" CACHE STRING "Man pages to generate and install.") - set_property(CACHE MAN PROPERTY STRINGS "HTML" "TROFF" "TROFF & HTML" "NONE") + set(SOLSTICE_DOC "HTML" CACHE STRING + "Type of documentation to generate and install.") endif() +set_property(CACHE SOLSTICE_DOC PROPERTY STRINGS + "HTML" + "TROFF" + "TROFF & HTML" + "NONE") + set(SOLSTICE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src/) ################################################################################ @@ -66,7 +72,7 @@ include_directories( ################################################################################ # Build subprojects ################################################################################ -if(NOT MAN STREQUAL "NONE") +if(NOT SOLSTICE_DOC STREQUAL "NONE") add_subdirectory(doc) endif() add_subdirectory(parser) diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt @@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 2.8) -string(REGEX MATCH ".*HTML.*" _html ${MAN}) -string(REGEX MATCH ".*TROFF.*" _troff ${MAN}) +string(REGEX MATCH ".*HTML.*" _html ${SOLSTICE_DOC}) +string(REGEX MATCH ".*TROFF.*" _troff ${SOLSTICE_DOC}) set(SOLSTICE_DOC_DIR ${PROJECT_SOURCE_DIR}/../doc)