diff options
| author | Abseil Team <absl-team@google.com> | 2024-05-26 18:13:50 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2024-05-26 18:14:44 -0700 |
| commit | 1c177722b998a62d7ffcf6c73c2b8542f4c83754 (patch) | |
| tree | cb5b6a65423a50ec929ad918507ea7b852d64bf9 | |
| parent | baf07b1f6201e4a6b3f16d87131a558693197c6f (diff) | |
| download | abseil-1c177722b998a62d7ffcf6c73c2b8542f4c83754.tar.gz abseil-1c177722b998a62d7ffcf6c73c2b8542f4c83754.tar.bz2 abseil-1c177722b998a62d7ffcf6c73c2b8542f4c83754.zip | |
Build abseil_test_dll with ABSL_BUILD_TESTING
... even if ABSL_BUILD_TEST_HELPERS is not specified.
When not using ABSL_BUILD_DLL, tests builds even if ABSL_BUILD_TEST_HELPERS is not specified. Make this work for ABSL_BUILD_DLL, by ensuring that (BUILD_TESTING AND ABSL_BUILD_TESTING) triggers abseil_test_dll build.
PiperOrigin-RevId: 637493023
Change-Id: Icd5868c547365f4788caac47e002fbfc32a03e94
| -rw-r--r-- | absl/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | ci/windows_msvc_cmake.bat | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/absl/CMakeLists.txt b/absl/CMakeLists.txt index 3a7c12fe..810d7f31 100644 --- a/absl/CMakeLists.txt +++ b/absl/CMakeLists.txt @@ -36,9 +36,9 @@ add_subdirectory(time) add_subdirectory(types) add_subdirectory(utility) -if (${ABSL_BUILD_DLL}) +if (ABSL_BUILD_DLL) absl_make_dll() - if (${ABSL_BUILD_TEST_HELPERS}) + if ((BUILD_TESTING AND ABSL_BUILD_TESTING) OR ABSL_BUILD_TEST_HELPERS) absl_make_dll(TEST ON) endif() endif() diff --git a/ci/windows_msvc_cmake.bat b/ci/windows_msvc_cmake.bat index c0f1ac94..8b431d77 100755 --- a/ci/windows_msvc_cmake.bat +++ b/ci/windows_msvc_cmake.bat @@ -56,7 +56,6 @@ CD "build" SET CXXFLAGS="/WX" %CMAKE_BIN% ^ - -DABSL_BUILD_TEST_HELPERS=ON ^ -DABSL_BUILD_TESTING=ON ^ -DABSL_GOOGLETEST_DOWNLOAD_URL=%ABSL_GOOGLETEST_DOWNLOAD_URL% ^ -DBUILD_SHARED_LIBS=%ABSL_CMAKE_BUILD_SHARED% ^ |