diff options
| -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% ^ |