Commit 75280437 authored by Matthew Woehlke's avatar Matthew Woehlke Committed by Jesse Beder
Browse files

Separate tests and tools

Don't build tests if the confusingly named YAML_CPP_BUILD_TOOLS is ON.
Instead, add a new option that controls only if the tests are built.
(Also, default tests to OFF.)
parent 3f33f337
...@@ -38,7 +38,8 @@ enable_testing() ...@@ -38,7 +38,8 @@ enable_testing()
### Project options ### Project options
### ###
## Project stuff ## Project stuff
option(YAML_CPP_BUILD_TOOLS "Enable testing and parse tools" ON) option(YAML_CPP_BUILD_TESTS "Enable testing" ON)
option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON)
option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" ON) option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" ON)
## Build options ## Build options
...@@ -349,8 +350,10 @@ endif() ...@@ -349,8 +350,10 @@ endif()
### ###
### Extras ### Extras
### ###
if(YAML_CPP_BUILD_TOOLS) if(YAML_CPP_BUILD_TESTS)
add_subdirectory(test) add_subdirectory(test)
endif()
if(YAML_CPP_BUILD_TOOLS)
add_subdirectory(util) add_subdirectory(util)
endif() endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment