ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: remove extraneous TestUtils directory

This commit is contained in:
Michael Maltese 2017-05-20 16:08:50 -07:00
parent 87d64afe19
commit 41fb6db6e3
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/UnitTests/CMakeLists.txt
View File

@ -11,7 +11,7 @@ file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
# Otherwise CMake inserts the library after core, but before other core # Otherwise CMake inserts the library after core, but before other core
# dependencies like videocommon which also use Host_ functions, which makes the # dependencies like videocommon which also use Host_ functions, which makes the
# GNU linker complain. # GNU linker complain.
add_library(unittests_stubhost OBJECT TestUtils/StubHost.cpp) add_library(unittests_stubhost OBJECT StubHost.cpp)
macro(add_dolphin_test target) macro(add_dolphin_test target)
add_executable(${target} EXCLUDE_FROM_ALL add_executable(${target} EXCLUDE_FROM_ALL
@ -27,8 +27,6 @@ macro(add_dolphin_test target)
add_test(NAME ${target} COMMAND ${target}) add_test(NAME ${target} COMMAND ${target})
endmacro() endmacro()
add_subdirectory(TestUtils)
add_subdirectory(Common) add_subdirectory(Common)
add_subdirectory(Core) add_subdirectory(Core)
add_subdirectory(VideoCommon) add_subdirectory(VideoCommon)

0
Source/UnitTests/TestUtils/StubHost.cpp → Source/UnitTests/StubHost.cpp
View File

9
Source/UnitTests/TestUtils/CMakeLists.txt
View File

@ -1,9 +0,0 @@
set(SRCS
# Do not add StubHost.cpp here - it is added manually via add_dolphin_test.
)
set(LIBS
)
# TODO: uncomment when there is actually something here.
#add_dolphin_library(testutils "${SRCS}" "${LIBS}")

1
Source/UnitTests/UnitTests.vcxproj
View File

@ -60,6 +60,7 @@
<ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" /> <ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" />
<ClCompile Include="$(ExternalsDir)gtest\src\gtest_main.cc" /> <ClCompile Include="$(ExternalsDir)gtest\src\gtest_main.cc" />
<!--Lump all of the tests (and supporting code) into one binary--> <!--Lump all of the tests (and supporting code) into one binary-->
<ClCompile Include="*.cpp" />
<ClCompile Include="*\*.cpp" /> <ClCompile Include="*\*.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>