Skip to content
Snippets Groups Projects
Commit 765541cd authored by Roman Gershman's avatar Roman Gershman
Browse files

Relax dependency on googletest and allow customization of cctz target

parent ff704564
No related branches found
No related tags found
No related merge requests found
...@@ -58,29 +58,34 @@ list(APPEND ABSL_COMMON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) ...@@ -58,29 +58,34 @@ list(APPEND ABSL_COMMON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_CXX_FLAGS "${ABSL_STD_CXX_FLAG} ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${ABSL_STD_CXX_FLAG} ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_WARNING_VLA} ${CMAKE_CXX_FLAGS} ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_WARNING_VLA} ${CMAKE_CXX_FLAGS} ")
# find dependencies # find dependencies
## pthread ## pthread
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
if(NOT CCTZ_TARGET)
set(CCTZ_TARGET cctz)
endif()
# commented: used only for standalone test # commented: used only for standalone test
#add_subdirectory(cctz) #add_subdirectory(cctz)
#add_subdirectory(googletest) #add_subdirectory(googletest)
check_target({${CCTZ_TARGET})
## check targets ## check targets
check_target(cctz) if(BUILD_TESTING)
check_target(gtest) check_target(gtest)
check_target(gtest_main) check_target(gtest_main)
check_target(gmock) check_target(gmock)
# -fexceptions # -fexceptions
set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}")
list(APPEND ABSL_TEST_COMMON_LIBRARIES list(APPEND ABSL_TEST_COMMON_LIBRARIES
gtest_main gtest_main
gtest gtest
gmock gmock
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
endif()
add_subdirectory(absl) add_subdirectory(absl)
...@@ -32,7 +32,7 @@ list(APPEND TIME_SRC ...@@ -32,7 +32,7 @@ list(APPEND TIME_SRC
${TIME_PUBLIC_HEADERS} ${TIME_PUBLIC_HEADERS}
${TIME_INTERNAL_HEADERS} ${TIME_INTERNAL_HEADERS}
) )
set(TIME_PUBLIC_LIBRARIES absl::base absl::stacktrace absl::int128 cctz) set(TIME_PUBLIC_LIBRARIES absl::base absl::stacktrace absl::int128 {CCTZ_TARGET})
absl_library( absl_library(
TARGET TARGET
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment