mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 19:09:40 +00:00
Code Issues Releases Wiki Activity

purge unnecessary cmake cruft

Browse source
This commit is contained in:
Bret Curtis 2023-05-02 09:24:08 +02:00
parent 2a98519451
commit df06e0d7b9
4 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/mwiniimporter_tests/CMakeLists.txt
View file

@ -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}) 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 target_link_libraries(openmw-iniimporter-tests PRIVATE
GTest::GTest GTest::GTest
GMock::GMock GMock::GMock

5
apps/mwiniimporter_tests/main.cpp
View file

@ -41,11 +41,8 @@ int runBinary(
const std::filesystem::path& binaryPath, const std::filesystem::path& iniPath, const std::filesystem::path& cfgPath) const std::filesystem::path& binaryPath, const std::filesystem::path& iniPath, const std::filesystem::path& cfgPath)
{ {
#ifdef _WIN32 #ifdef _WIN32
std::wstring wBinaryPath = binaryPath.native();
std::wstring wIniPath = iniPath.native();
std::wstring wCfgPath = cfgPath.native();
std::wstringstream cmd; 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()); return _wsystem(cmd.str().c_str());
#else #else
std::stringstream cmd; std::stringstream cmd;

3
apps/opencs_tests/CMakeLists.txt
View file

@ -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}) 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 target_link_libraries(openmw-cs-tests PRIVATE
openmw-cs-lib openmw-cs-lib
GTest::GTest GTest::GTest

3
apps/openmw_test_suite/CMakeLists.txt
View file

@ -1,6 +1,3 @@
include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
file(GLOB UNITTEST_SRC_FILES file(GLOB UNITTEST_SRC_FILES
testing_util.hpp testing_util.hpp