commit 4f18a245e5471d8efae21e01583a1ebbb2a36ac3
author Ehsan Nasiri <ehsann@google.com> Wed May 03 10:56:47 2017 -0400
committer Paul Wankadia <junyer@google.com> Fri May 05 08:47:20 2017 +0000
tree 62540839ab0becd2c4e36b9d6a41827f5bc0dedb
parent 1bcbb5f704bd59de4295daa92d42edae2545498f

Do not build the test targets when asked not to.

Change-Id: I0b458691183c8aac1e4e3065b44012aa41586698
Reviewed-on: https://code-review.googlesource.com/12631
Reviewed-by: Paul Wankadia <junyer@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfb946c..6fbdf19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,59 +72,59 @@
 
 add_library(re2 ${RE2_SOURCES})
 
-set(TESTING_SOURCES
-    re2/testing/backtrack.cc
-    re2/testing/dump.cc
-    re2/testing/exhaustive_tester.cc
-    re2/testing/null_walker.cc
-    re2/testing/regexp_generator.cc
-    re2/testing/string_generator.cc
-    re2/testing/tester.cc
-    util/pcre.cc
-    )
+if(RE2_BUILD_TESTING)
+  set(TESTING_SOURCES
+      re2/testing/backtrack.cc
+      re2/testing/dump.cc
+      re2/testing/exhaustive_tester.cc
+      re2/testing/null_walker.cc
+      re2/testing/regexp_generator.cc
+      re2/testing/string_generator.cc
+      re2/testing/tester.cc
+      util/pcre.cc
+      )
 
-add_library(testing STATIC ${TESTING_SOURCES})
+  add_library(testing STATIC ${TESTING_SOURCES})
 
-set(TEST_TARGETS
-    charclass_test
-    compile_test
-    filtered_re2_test
-    mimics_pcre_test
-    parse_test
-    possible_match_test
-    re2_test
-    re2_arg_test
-    regexp_test
-    required_prefix_test
-    search_test
-    set_test
-    simplify_test
-    string_generator_test
+  set(TEST_TARGETS
+      charclass_test
+      compile_test
+      filtered_re2_test
+      mimics_pcre_test
+      parse_test
+      possible_match_test
+      re2_test
+      re2_arg_test
+      regexp_test
+      required_prefix_test
+      search_test
+      set_test
+      simplify_test
+      string_generator_test
 
-    dfa_test
-    exhaustive1_test
-    exhaustive2_test
-    exhaustive3_test
-    exhaustive_test
-    random_test
-    )
+      dfa_test
+      exhaustive1_test
+      exhaustive2_test
+      exhaustive3_test
+      exhaustive_test
+      random_test
+      )
 
-set(BENCHMARK_TARGETS
-    regexp_benchmark
-    )
+  set(BENCHMARK_TARGETS
+      regexp_benchmark
+      )
 
-foreach(target ${TEST_TARGETS})
-  add_executable(${target} re2/testing/${target}.cc util/test.cc)
-  target_link_libraries(${target} testing re2 ${EXTRA_TARGET_LINK_LIBRARIES})
-  if(RE2_BUILD_TESTING)
+  foreach(target ${TEST_TARGETS})
+    add_executable(${target} re2/testing/${target}.cc util/test.cc)
+    target_link_libraries(${target} testing re2 ${EXTRA_TARGET_LINK_LIBRARIES})
     add_test(NAME ${target} COMMAND ${target})
-  endif()
-endforeach(target)
+  endforeach(target)
 
-foreach(target ${BENCHMARK_TARGETS})
-  add_executable(${target} re2/testing/${target}.cc util/benchmark.cc)
-  target_link_libraries(${target} testing re2 ${EXTRA_TARGET_LINK_LIBRARIES})
-endforeach(target)
+  foreach(target ${BENCHMARK_TARGETS})
+    add_executable(${target} re2/testing/${target}.cc util/benchmark.cc)
+    target_link_libraries(${target} testing re2 ${EXTRA_TARGET_LINK_LIBRARIES})
+  endforeach(target)
+endif()
 
 set(RE2_HEADERS
     re2/filtered_re2.h