about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoman Gershman <romange@gmail.com>2018-01-29T19·08+0200
committerRoman Gershman <romange@gmail.com>2018-01-29T19·08+0200
commitfe2006e91fca5379bb7f5c7ad1ff33799573b394 (patch)
tree894b608a6dd3667ac865b0fc6936dd5a74f190c2
parent7994c57a901ddab6df6526e7e450d0ad73a1af96 (diff)
Update README.md
-rw-r--r--CMake/README.md3
-rw-r--r--CMakeLists.txt4
2 files changed, 4 insertions, 3 deletions
diff --git a/CMake/README.md b/CMake/README.md
index 0ae9c2686a88..15658c6899ff 100644
--- a/CMake/README.md
+++ b/CMake/README.md
@@ -29,7 +29,8 @@
     Note: Abseil requires CCTZ and the googletest framework. Consequently,
     the targets  `gtest`, `gtest_main`, `gmock` and `cctz` need
     to be declared in your project before including abseil with `add_subdirectory`.
-
+    However, if abseil is compiled with -DBUILD_TESTING=OFF, then `gtest`, `gmock` and `gtest_main` are not required.
+    In addition, it's possible to override the name of cctz target to custom one with option -DABSL_CCTZ_TARGET=my_cctz
 
   4- Add the absl:: target you wish to use to the `target_link_libraries()`
     section of your executable or of your library
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15e3d9d5c168..b5a1d7792e0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,8 +62,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_WARNING_VLA} ${CMAKE_CXX_FLAGS} ")
 ## pthread
 find_package(Threads REQUIRED)
 
-if(NOT CCTZ_TARGET)
-  set(CCTZ_TARGET cctz)
+if(NOT ABSL_CCTZ_TARGET)
+  set(ABSL_CCTZ_TARGET cctz)
 endif()
 
 # commented: used only for standalone test