From cb7c7091da02c4f322f41ddcca18555a3f4f0632 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sat, 8 Feb 2025 08:39:31 +0100 Subject: [PATCH 1/2] Remove unneeded options --- cmake/compiler-env.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmake/compiler-env.cmake b/cmake/compiler-env.cmake index ff756b49..b5eb9255 100644 --- a/cmake/compiler-env.cmake +++ b/cmake/compiler-env.cmake @@ -88,11 +88,6 @@ if(MSVC) momo_add_c_and_cxx_release_compile_options( /Ob2 - #/GL - ) - - momo_add_release_link_options( - #/LTCG ) add_compile_definitions( From 0660c0dd63c0273f2d40e3ae5da648f544a568e6 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sat, 8 Feb 2025 08:39:38 +0100 Subject: [PATCH 2/2] Use gtest-main --- src/windows-emulator-test/CMakeLists.txt | 1 + src/windows-emulator-test/main.cpp | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 src/windows-emulator-test/main.cpp diff --git a/src/windows-emulator-test/CMakeLists.txt b/src/windows-emulator-test/CMakeLists.txt index 202db345..03e29838 100644 --- a/src/windows-emulator-test/CMakeLists.txt +++ b/src/windows-emulator-test/CMakeLists.txt @@ -12,6 +12,7 @@ momo_assign_source_group(${SRC_FILES}) target_link_libraries(windows-emulator-test PRIVATE gtest + gtest_main windows-emulator ) diff --git a/src/windows-emulator-test/main.cpp b/src/windows-emulator-test/main.cpp deleted file mode 100644 index 978a5982..00000000 --- a/src/windows-emulator-test/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -}