From 71bea5fc0004e55895cc824d4ba76fed6888bcb4 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Tue, 15 Feb 2022 22:00:08 +0200
Subject: [PATCH] [VR Build] Rename VR client executable

---
 CMakeLists.txt             | 18 +++++++++---------
 apps/openmw/CMakeLists.txt | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ece3f91af..db2d7577b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -720,19 +720,19 @@ if (WIN32)
 
     # TODO: properties and link targets should be copied from openmw to openmw_vr instead of duplicating every line
     if (USE_DEBUG_CONSOLE AND BUILD_OPENMW_VR)
-      set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
-      set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
-      set_target_properties(openmw_vr PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_CONSOLE>)
+      set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
+      set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
+      set_target_properties(tes3mp_vr PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_CONSOLE>)
     elseif (BUILD_OPENMW_VR)
       # Turn off debug console, debug output will be written to visual studio output instead
-      set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
-      set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
+      set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+      set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
     endif()
 
     if (BUILD_OPENMW_VR)
         # Release builds don't use the debug console
-        set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
-        set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
+        set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+        set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
     endif()
 
     # Play a bit with the warning levels
@@ -809,9 +809,9 @@ if (WIN32)
 
     if (BUILD_OPENMW_VR)
         if (OPENMW_UNITY_BUILD)
-            set_target_properties(openmw_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
+            set_target_properties(tes3mp_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
         else()
-            set_target_properties(openmw_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+            set_target_properties(tes3mp_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
         endif()
     endif()
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index dd327eca6..02308c02a 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -328,7 +328,7 @@ endif()
 if(BUILD_OPENMW_VR)
 # Use of FetchContent to include the OpenXR SDK requires CMake 3.11
     if(${CMAKE_VERSION} VERSION_LESS "3.11") 
-        message(FATAL_ERROR "Building openmw_vr requires CMake version 3.11 or later.")
+        message(FATAL_ERROR "Building tes3mp_vr requires CMake version 3.11 or later.")
     endif()
 
 # TODO: Openmw and openmw_vr should preferrably share game code as a static or shared library
@@ -343,7 +343,7 @@ if(BUILD_OPENMW_VR)
          vranimation vrcamera vrenvironment vrframebuffer vrgui vrinputmanager vrinput vrlistbox vrmetamenu vrpointer vrsession vrtracking vrtypes vrutil vrviewer vrvirtualkeyboard
         )
 
-    openmw_add_executable(openmw_vr
+    openmw_add_executable(tes3mp_vr
         ${OPENMW_FILES}
         ${OPENMW_VR_FILES}
         ${GAME} ${GAME_HEADER}
@@ -364,25 +364,25 @@ if(BUILD_OPENMW_VR)
     )
     FetchContent_MakeAvailable(OpenXR)
 
-    target_link_libraries(openmw_vr openxr_loader)
+    target_link_libraries(tes3mp_vr openxr_loader)
 
     # Preprocessor variable used to control code paths to vr code
     if (WIN32)
-        target_compile_options(openmw_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_GRAPHICS_API_D3D11 -DXR_USE_PLATFORM_WIN32)
+        target_compile_options(tes3mp_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_GRAPHICS_API_D3D11 -DXR_USE_PLATFORM_WIN32)
     elseif(UNIX)
-        target_compile_options(openmw_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_PLATFORM_XLIB)
+        target_compile_options(tes3mp_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_PLATFORM_XLIB)
         find_package(X11 REQUIRED)
-        target_link_libraries(openmw_vr ${X11_LIBRARIES})
+        target_link_libraries(tes3mp_vr ${X11_LIBRARIES})
     endif()
-    target_link_libraries(openmw_vr ${OPENMW_LINK_TARGETS})
+    target_link_libraries(tes3mp_vr ${OPENMW_LINK_TARGETS})
     if(APPLE)
-        add_custom_command(TARGET openmw_vr
+        add_custom_command(TARGET tes3mp_vr
             POST_BUILD
             COMMAND cp "${OpenMW_BINARY_DIR}/resources/version" "${BUNDLE_RESOURCES_DIR}/resources")
     endif(APPLE)
 
     if (WIN32)
-        INSTALL(TARGETS openmw_vr RUNTIME DESTINATION ".")
+        INSTALL(TARGETS tes3mp_vr RUNTIME DESTINATION ".")
     endif (WIN32)
 endif()