From 41fb6db6e35b2e78397dc17d4e1fa834ada46f26 Mon Sep 17 00:00:00 2001
From: Michael Maltese <michaeljosephmaltese@gmail.com>
Date: Sat, 20 May 2017 16:08:50 -0700
Subject: CMake: remove extraneous TestUtils directory

---
 Source/UnitTests/CMakeLists.txt           |  4 +-
 Source/UnitTests/StubHost.cpp             | 69 +++++++++++++++++++++++++++++++
 Source/UnitTests/TestUtils/CMakeLists.txt |  9 ----
 Source/UnitTests/TestUtils/StubHost.cpp   | 69 -------------------------------
 Source/UnitTests/UnitTests.vcxproj        |  3 +-
 5 files changed, 72 insertions(+), 82 deletions(-)
 create mode 100644 Source/UnitTests/StubHost.cpp
 delete mode 100644 Source/UnitTests/TestUtils/CMakeLists.txt
 delete mode 100644 Source/UnitTests/TestUtils/StubHost.cpp

(limited to 'Source/UnitTests')

diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt
index a60fa05996..4f97ce5793 100644
--- a/Source/UnitTests/CMakeLists.txt
+++ b/Source/UnitTests/CMakeLists.txt
@@ -11,7 +11,7 @@ file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
 # Otherwise CMake inserts the library after core, but before other core
 # dependencies like videocommon which also use Host_ functions, which makes the
 # GNU linker complain.
-add_library(unittests_stubhost OBJECT TestUtils/StubHost.cpp)
+add_library(unittests_stubhost OBJECT StubHost.cpp)
 
 macro(add_dolphin_test target)
   add_executable(${target} EXCLUDE_FROM_ALL
@@ -27,8 +27,6 @@ macro(add_dolphin_test target)
   add_test(NAME ${target} COMMAND ${target})
 endmacro()
 
-add_subdirectory(TestUtils)
-
 add_subdirectory(Common)
 add_subdirectory(Core)
 add_subdirectory(VideoCommon)
diff --git a/Source/UnitTests/StubHost.cpp b/Source/UnitTests/StubHost.cpp
new file mode 100644
index 0000000000..1519af27a6
--- /dev/null
+++ b/Source/UnitTests/StubHost.cpp
@@ -0,0 +1,69 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Stub implementation of the Host_* callbacks for tests. These implementations
+// do nothing except return default values when required.
+
+#include <memory>
+#include <string>
+
+#include "Common/GL/GLInterfaceBase.h"
+#include "Core/Host.h"
+
+void Host_NotifyMapLoaded()
+{
+}
+void Host_RefreshDSPDebuggerWindow()
+{
+}
+void Host_Message(int)
+{
+}
+void* Host_GetRenderHandle()
+{
+  return nullptr;
+}
+void Host_UpdateTitle(const std::string&)
+{
+}
+void Host_UpdateDisasmDialog()
+{
+}
+void Host_UpdateMainFrame()
+{
+}
+void Host_RequestRenderWindowSize(int, int)
+{
+}
+void Host_SetStartupDebuggingParameters()
+{
+}
+bool Host_UIHasFocus()
+{
+  return false;
+}
+bool Host_RendererHasFocus()
+{
+  return false;
+}
+bool Host_RendererIsFullscreen()
+{
+  return false;
+}
+void Host_ConnectWiimote(int, bool)
+{
+}
+void Host_SetWiiMoteConnectionState(int)
+{
+}
+void Host_ShowVideoConfig(void*, const std::string&)
+{
+}
+void Host_YieldToUI()
+{
+}
+std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface()
+{
+  return nullptr;
+}
diff --git a/Source/UnitTests/TestUtils/CMakeLists.txt b/Source/UnitTests/TestUtils/CMakeLists.txt
deleted file mode 100644
index 79424a42a6..0000000000
--- a/Source/UnitTests/TestUtils/CMakeLists.txt
+++ /dev/null
@@ -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}")
diff --git a/Source/UnitTests/TestUtils/StubHost.cpp b/Source/UnitTests/TestUtils/StubHost.cpp
deleted file mode 100644
index 1519af27a6..0000000000
--- a/Source/UnitTests/TestUtils/StubHost.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2014 Dolphin Emulator Project
-// Licensed under GPLv2+
-// Refer to the license.txt file included.
-
-// Stub implementation of the Host_* callbacks for tests. These implementations
-// do nothing except return default values when required.
-
-#include <memory>
-#include <string>
-
-#include "Common/GL/GLInterfaceBase.h"
-#include "Core/Host.h"
-
-void Host_NotifyMapLoaded()
-{
-}
-void Host_RefreshDSPDebuggerWindow()
-{
-}
-void Host_Message(int)
-{
-}
-void* Host_GetRenderHandle()
-{
-  return nullptr;
-}
-void Host_UpdateTitle(const std::string&)
-{
-}
-void Host_UpdateDisasmDialog()
-{
-}
-void Host_UpdateMainFrame()
-{
-}
-void Host_RequestRenderWindowSize(int, int)
-{
-}
-void Host_SetStartupDebuggingParameters()
-{
-}
-bool Host_UIHasFocus()
-{
-  return false;
-}
-bool Host_RendererHasFocus()
-{
-  return false;
-}
-bool Host_RendererIsFullscreen()
-{
-  return false;
-}
-void Host_ConnectWiimote(int, bool)
-{
-}
-void Host_SetWiiMoteConnectionState(int)
-{
-}
-void Host_ShowVideoConfig(void*, const std::string&)
-{
-}
-void Host_YieldToUI()
-{
-}
-std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface()
-{
-  return nullptr;
-}
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 9c91baf8c0..27cc4992d0 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -60,6 +60,7 @@
     <ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" />
     <ClCompile Include="$(ExternalsDir)gtest\src\gtest_main.cc" />
     <!--Lump all of the tests (and supporting code) into one binary-->
+    <ClCompile Include="*.cpp" />
     <ClCompile Include="*\*.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -111,4 +112,4 @@
     <!--This is only executed via msbuild, VS test runner automatically does this-->
     <Exec Command="$(TargetPath)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
-- 
cgit v1.2.3