From cf412fb7db2a6c038939394e4d68684220bbd3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Tue, 19 Apr 2022 22:02:39 +0200
Subject: [PATCH] Set default project to first creted target in project.
 Cleaner way to run from executable.

---
 mo2_cpp.cmake   | 37 +++++++++++++++++++++++--------------
 mo2_utils.cmake | 22 ++++++----------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/mo2_cpp.cmake b/mo2_cpp.cmake
index 9a2a89c..1b80c83 100644
--- a/mo2_cpp.cmake
+++ b/mo2_cpp.cmake
@@ -187,6 +187,13 @@ function(mo2_configure_target MO2_TARGET)
 		mo2_add_dependencies(${MO2_TARGET} PRIVATE ${MO2_PRIVATE_DEPENDS})
 	endif()
 
+	# set the VS startup project if not already set
+	get_property(startup_project DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT)
+
+	if (NOT startup_project)
+		set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${MO2_TARGET})
+	endif()
+
 endfunction()
 
 #! mo2_configure_tests : configure a target as a MO2 C++ tests
@@ -224,6 +231,9 @@ function(mo2_configure_uibase MO2_TARGET)
 
 	target_include_directories(${MO2_TARGET} PUBLIC
 		${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/game_features)
+
+	mo2_set_project_to_run_from_install(
+		${MO2_TARGET} EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe)
 endfunction()
 
 #! mo2_configure_plugin : configure a target as a MO2 C++ plugin
@@ -235,6 +245,9 @@ function(mo2_configure_plugin MO2_TARGET)
 	mo2_add_dependencies(${MO2_TARGET} PRIVATE uibase)
 
 	set_target_properties(${MO2_TARGET} PROPERTIES MO2_TARGET_TYPE "plugin")
+
+	mo2_set_project_to_run_from_install(
+		${MO2_TARGET} EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe)
 endfunction()
 
 #! mo2_configure_library : configure a C++ library (NOT a plugin)
@@ -252,6 +265,8 @@ function(mo2_configure_library MO2_TARGET)
 	if (${TARGET_TYPE} STREQUAL "STATIC_LIBRARY")
 		set_target_properties(${MO2_TARGET} PROPERTIES MO2_TARGET_TYPE "library-static")
 	else()
+		mo2_set_project_to_run_from_install(
+			${MO2_TARGET} EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe)
 		set_target_properties(${MO2_TARGET} PROPERTIES MO2_TARGET_TYPE "library-shared")
 	endif()
 endfunction()
@@ -269,6 +284,14 @@ function(mo2_configure_executable MO2_TARGET)
 		WIN32_EXECUTABLE TRUE
 		MO2_TARGET_TYPE "executable")
 
+	get_target_property(output_name ${MO2_TARGET} OUTPUT_NAME)
+	if("${output_name}" STREQUAL "output_name-NOTFOUND")
+		set(output_name ${MO2_TARGET})
+	endif()
+
+	mo2_set_project_to_run_from_install(
+		${MO2_TARGET} EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/${output_name})
+
 	if (${MO2_ELEVATED})
 		# does not work with target_link_options, so keeping it that way for now... this
 		# is not a very used option anyway
@@ -312,18 +335,4 @@ function(mo2_install_target MO2_TARGET)
 		install(FILES $<TARGET_PDB_FILE:${MO2_TARGET}> DESTINATION pdb)
 	endif()
 
-	# set project to run from main MO2 executable or from themselves for executable
-	if (${MO2_TARGET_TYPE} STREQUAL "executable")
-		get_target_property(output_name ${MO2_TARGET} OUTPUT_NAME)
-		if("${output_name}" STREQUAL "output_name-NOTFOUND")
-			set(output_name ${MO2_TARGET})
-
-			mo2_set_project_to_run_from_install(
-				PROJECT ${PROJECT_NAME} EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/${output_name})
-		endif()
-	elseif(NOT (${MO2_TARGET_TYPE} STREQUAL "library-static"))
-		mo2_set_project_to_run_from_install(
-			PROJECT ${PROJECT_NAME} EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe)
-	endif()
-
 endfunction()
diff --git a/mo2_utils.cmake b/mo2_utils.cmake
index 55ae6de..b5db600 100644
--- a/mo2_utils.cmake
+++ b/mo2_utils.cmake
@@ -26,27 +26,17 @@ endfunction()
 # \param:EXECUTABLE full path to the executable
 # \param:WORKDIR working directory (optional, default is the directory of the executable)
 #
-function(mo2_set_project_to_run_from_install)
-	cmake_parse_arguments(MO2 "" "PROJECT;EXECUTABLE;WORKDIR" "" ${ARGN})
-
-	set(vcxproj_user_file "${CMAKE_CURRENT_BINARY_DIR}/${MO2_PROJECT}.vcxproj.user")
+function(mo2_set_project_to_run_from_install TARGET)
+	cmake_parse_arguments(MO2 "" "EXECUTABLE;WORKDIR" "" ${ARGN})
 
     # extract directory
     if (NOT DEFINED MO2_WORKDIR)
-        get_filename_component(MO2_WORKDIR ${MO2_EXECUTABLE} DIRECTORY )
+        get_filename_component(MO2_WORKDIR ${MO2_EXECUTABLE} DIRECTORY)
     endif()
 
-	if(NOT EXISTS ${vcxproj_user_file})
-		file(WRITE ${vcxproj_user_file}
-			"<?xml version=\"1.0\" encoding=\"utf-8\"?>
-				<Project ToolsVersion=\"Current\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
-				  <PropertyGroup>
-					<LocalDebuggerWorkingDirectory>${MO2_WORKDIR}</LocalDebuggerWorkingDirectory>
-					<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-					<LocalDebuggerCommand>${MO2_EXECUTABLE}</LocalDebuggerCommand>
-				  </PropertyGroup>
-				</Project>")
-	endif()
+	set_target_properties(${MO2_TARGET} PROPERTIES
+		VS_DEBUGGER_WORKING_DIRECTORY "${MO2_WORKDIR}"
+		VS_DEBUGGER_COMMAND "${MO2_EXECUTABLE}")
 endfunction()
 
 #! mo2_required_variable : check that a variable is defined, fails otherwise