Skip test build with same option as run

pjohnmeyer · pjohnmeyer · commit 6b69ed78bae7 · 2016-07-18T21:13:03.000-05:00
As part of this, changed the option name to
`UTPP_INCLUDE_TESTS_IN_BUILD`. The test target is still added to the
build and can be built/run separately using the CMake --target option.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(UnitTest++)
 option(UTPP_USE_PLUS_SIGN
     "Set this to OFF if you wish to use '-cpp' instead of '++' in lib/include paths"
     ON)
-option(UTPP_RUN_TESTS_AS_BUILD_STEP
-    "Set this to OFF if you do not wish unit tests to run as part of cmake --build"
+option(UTPP_INCLUDE_TESTS_IN_BUILD
+    "Set this to OFF if you do not wish to automatically build or run unit tests as part of the default cmake --build"
     ON)
 
 if(MSVC14 OR MSVC12)
@@ -60,14 +60,13 @@ endif()
 
 target_link_libraries(TestUnitTest++ UnitTest++)
 
-if(${UTPP_RUN_TESTS_AS_BUILD_STEP})
-    # run unit tests as post build step
-    add_custom_command(TARGET TestUnitTest++
-        POST_BUILD COMMAND TestUnitTest++
-        COMMENT "Running unit tests")
-else()
-    add_custom_command(TARGET TestUnitTest++
-        POST_BUILD COMMAND echo "TestUnitTest++ was not run as a build step because UTPP_RUN_TESTS_AS_BUILD_STEP is OFF")
+# run unit tests as post build step
+add_custom_command(TARGET TestUnitTest++
+    POST_BUILD COMMAND TestUnitTest++
+    COMMENT "Running unit tests")
+
+if(NOT ${UTPP_INCLUDE_TESTS_IN_BUILD})
+    set_target_properties(TestUnitTest++ PROPERTIES EXCLUDE_FROM_ALL 1)
 endif()
 
 # add install targets
