mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 02:29:01 +08:00
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index b18407f..f1be4c0 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -52,9 +52,6 @@ FetchContent_Declare(
|
||
|
|
# For Windows: Prevent overriding the parent project's compiler/linker settings
|
||
|
|
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||
|
|
|
||
|
|
-FetchContent_MakeAvailable(googletest)
|
||
|
|
-include(GoogleTest)
|
||
|
|
-
|
||
|
|
add_subdirectory(au)
|
||
|
|
|
||
|
|
# Configure how Au will be installed.
|
||
|
|
diff --git a/cmake/AuConfig.cmake.in b/cmake/AuConfig.cmake.in
|
||
|
|
index b121f76..65da38a 100644
|
||
|
|
--- a/cmake/AuConfig.cmake.in
|
||
|
|
+++ b/cmake/AuConfig.cmake.in
|
||
|
|
@@ -14,9 +14,6 @@
|
||
|
|
|
||
|
|
@PACKAGE_INIT@
|
||
|
|
|
||
|
|
-include(CMakeFindDependencyMacro)
|
||
|
|
-find_dependency(googletest 1.12.1)
|
||
|
|
-
|
||
|
|
include(${CMAKE_CURRENT_LIST_DIR}/AuHeaders.cmake)
|
||
|
|
|
||
|
|
check_required_components(Au)
|
||
|
|
diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake
|
||
|
|
index 28daf00..f2bf389 100644
|
||
|
|
--- a/cmake/HeaderOnlyLibrary.cmake
|
||
|
|
+++ b/cmake/HeaderOnlyLibrary.cmake
|
||
|
|
@@ -75,7 +75,7 @@ function(header_only_library)
|
||
|
|
)
|
||
|
|
|
||
|
|
# Add the test, if requested.
|
||
|
|
- if (DEFINED ARG_GTEST_SRCS)
|
||
|
|
+ if (0)
|
||
|
|
add_executable("${ARG_NAME}_test")
|
||
|
|
target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS})
|
||
|
|
target_link_libraries(
|