From 75fdfe3e0eb874f9feb7820e602d1ea4bc45439f Mon Sep 17 00:00:00 2001 From: vitaut <victor.zverovich@gmail.com> Date: Mon, 31 Aug 2015 06:49:06 -0700 Subject: [PATCH] Make options that control target generation more consistent --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8494b92f6ce..7957ed898ba9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,11 @@ if (NOT CMAKE_BUILD_TYPE) endif () option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF) -option(FMT_INSTALL "Generate install target." ON) -option(FMT_TESTS "Generate tests." ON) -option(FMT_DOCS "Generate doxygen documentation." ON) + +# Options that control generation of various targets. +option(FMT_DOC "Generate the doc target." ON) +option(FMT_INSTALL "Generate the install target." ON) +option(FMT_TEST "Generate the test target." ON) project(FORMAT) @@ -115,11 +117,11 @@ endif () set_target_properties(cppformat PROPERTIES COMPILE_FLAGS "${FMT_EXTRA_COMPILE_FLAGS}") -if (FMT_DOCS) +if (FMT_DOC) add_subdirectory(doc) endif () -if (FMT_TESTS) +if (FMT_TEST) enable_testing() add_subdirectory(test) endif ()