From df06e0d7b9c2a5ecffdd1f12bbe5cfc8036975ed Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 2 May 2023 09:24:08 +0200 Subject: [PATCH] purge unnecessary cmake cruft --- apps/mwiniimporter_tests/CMakeLists.txt | 3 --- apps/mwiniimporter_tests/main.cpp | 5 +---- apps/opencs_tests/CMakeLists.txt | 3 --- apps/openmw_test_suite/CMakeLists.txt | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/apps/mwiniimporter_tests/CMakeLists.txt b/apps/mwiniimporter_tests/CMakeLists.txt index 6692c6021d..59bb81c132 100644 --- a/apps/mwiniimporter_tests/CMakeLists.txt +++ b/apps/mwiniimporter_tests/CMakeLists.txt @@ -6,9 +6,6 @@ source_group(apps\\openmw-iniimporter-tests FILES ${INIIMPORTER_TESTS_SRC_FILES} openmw_add_executable(openmw-iniimporter-tests ${INIIMPORTER_TESTS_SRC_FILES}) -target_include_directories(openmw-iniimporter-tests SYSTEM PRIVATE ${GTEST_INCLUDE_DIRS}) -target_include_directories(openmw-iniimporter-tests SYSTEM PRIVATE ${GMOCK_INCLUDE_DIRS}) - target_link_libraries(openmw-iniimporter-tests PRIVATE GTest::GTest GMock::GMock diff --git a/apps/mwiniimporter_tests/main.cpp b/apps/mwiniimporter_tests/main.cpp index 2c40db293d..66e54d6675 100644 --- a/apps/mwiniimporter_tests/main.cpp +++ b/apps/mwiniimporter_tests/main.cpp @@ -41,11 +41,8 @@ int runBinary( const std::filesystem::path& binaryPath, const std::filesystem::path& iniPath, const std::filesystem::path& cfgPath) { #ifdef _WIN32 - std::wstring wBinaryPath = binaryPath.native(); - std::wstring wIniPath = iniPath.native(); - std::wstring wCfgPath = cfgPath.native(); std::wstringstream cmd; - cmd << wBinaryPath << L" -i " << wIniPath << L" -c " << wCfgPath; + cmd << binaryPath.native() << L" -i " << iniPath.native() << L" -c " << cfgPath.native(); return _wsystem(cmd.str().c_str()); #else std::stringstream cmd; diff --git a/apps/opencs_tests/CMakeLists.txt b/apps/opencs_tests/CMakeLists.txt index 2b7309f8b9..3471bf4d77 100644 --- a/apps/opencs_tests/CMakeLists.txt +++ b/apps/opencs_tests/CMakeLists.txt @@ -8,9 +8,6 @@ source_group(apps\\openmw-cs-tests FILES ${OPENCS_TESTS_SRC_FILES}) openmw_add_executable(openmw-cs-tests ${OPENCS_TESTS_SRC_FILES}) -target_include_directories(openmw-cs-tests SYSTEM PRIVATE ${GTEST_INCLUDE_DIRS}) -target_include_directories(openmw-cs-tests SYSTEM PRIVATE ${GMOCK_INCLUDE_DIRS}) - target_link_libraries(openmw-cs-tests PRIVATE openmw-cs-lib GTest::GTest diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt index 967511953d..1adf76fa2c 100644 --- a/apps/openmw_test_suite/CMakeLists.txt +++ b/apps/openmw_test_suite/CMakeLists.txt @@ -1,6 +1,3 @@ -include_directories(SYSTEM ${GTEST_INCLUDE_DIRS}) -include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS}) - file(GLOB UNITTEST_SRC_FILES testing_util.hpp