mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index 4344119..665dd4b 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -3,12 +3,9 @@
|
|
cmake_minimum_required(VERSION 3.15)
|
|
project(metee_test)
|
|
|
|
-set(CMAKE_CXX_STANDARD 11)
|
|
+set(CMAKE_CXX_STANDARD 17)
|
|
|
|
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src)
|
|
- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src
|
|
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
|
|
- )
|
|
+if(TRUE)
|
|
else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src)
|
|
# Download and unpack googletest at configure time
|
|
configure_file(gtest.cmake.in googletest-download/CMakeLists.txt)
|
|
@@ -36,13 +33,6 @@ set(gtest_force_shared_crt
|
|
CACHE BOOL "" FORCE
|
|
)
|
|
|
|
-# Add googletest directly to our build. This defines the gtest and gtest_main
|
|
-# targets.
|
|
-add_subdirectory(
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL
|
|
-)
|
|
-
|
|
add_executable(${PROJECT_NAME}
|
|
Main.cpp
|
|
metee_test.cpp
|
|
@@ -53,7 +43,7 @@ if(NOT CONSOLE_OUTPUT)
|
|
target_compile_definitions(${PROJECT_NAME} PRIVATE -DSYSLOG)
|
|
endif()
|
|
|
|
-target_link_libraries(${PROJECT_NAME} metee gtest_main gmock_main)
|
|
+target_link_libraries(${PROJECT_NAME} metee gtest gmock)
|
|
|
|
target_include_directories(${PROJECT_NAME}
|
|
PRIVATE ${CMAKE_SOURCE_DIR}/src/Windows
|