From b9cd887dbcb5bf9a965963149340999f98f8e1aa Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Sat, 4 Mar 2023 16:21:49 +0800
Subject: [PATCH] msbuild: install & tweaks

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 CMakeLists.txt                |  4 ++++
 msbuild/FramelessHelper.props | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 076e375..148d5a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,10 @@ if(FRAMELESSHELPER_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
+if(NOT FRAMELESSHELPER_NO_INSTALL)
+    install(FILES "msbuild/FramelessHelper.props" DESTINATION "${CMAKE_INSTALL_PREFIX}")
+endif()
+
 if(NOT FRAMELESSHELPER_NO_SUMMARY)
     message("--------------------------- Toolchain ----------------------------")
     message("CMake version: ${CMAKE_VERSION} (${CMAKE_COMMAND})")
diff --git a/msbuild/FramelessHelper.props b/msbuild/FramelessHelper.props
index e9232b6..7276b75 100644
--- a/msbuild/FramelessHelper.props
+++ b/msbuild/FramelessHelper.props
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LibraryPath>$(MSBuildThisFileDirectory)$(Platform)\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(MSBuildThisFileDirectory)lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings">
-    <QtHeaderSearchPath>$(MSBuildThisFileDirectory)$(Platform)\include;$(QtHeaderSearchPath)</QtHeaderSearchPath>
+    <QtHeaderSearchPath>$(MSBuildThisFileDirectory)include;$(MSBuildThisFileDirectory)include\FramelessHelper;$(MSBuildThisFileDirectory)include\FramelessHelper\Core;$(MSBuildThisFileDirectory)include\FramelessHelper\Core\private;$(MSBuildThisFileDirectory)include\FramelessHelper\Widgets;$(MSBuildThisFileDirectory)include\FramelessHelper\Widgets\private;$(MSBuildThisFileDirectory)include\FramelessHelper\Quick;$(MSBuildThisFileDirectory)include\FramelessHelper\Quick\private;$(QtHeaderSearchPath)</QtHeaderSearchPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>FRAMELESSHELPER_QUICK_STATIC;FRAMELESSHELPER_WIDGETS_STATIC;FRAMELESSHELPER_CORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FRAMELESSHELPER_CORE_STATIC;FRAMELESSHELPER_WIDGETS_STATIC;FRAMELESSHELPER_QUICK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">FramelessHelperQuickd.lib;FramelessHelperWidgetsd.lib;FramelessHelperCored.lib;%(AdditionalDependencies);</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Configuration)'=='Release'">FramelessHelperQuick.lib;FramelessHelperWidgets.lib;FramelessHelperCore.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">FramelessHelperCored.lib;FramelessHelperWidgetsd.lib;FramelessHelperQuickd.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Release'">FramelessHelperCore.lib;FramelessHelperWidgets.lib;FramelessHelperQuick.lib;%(AdditionalDependencies);</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
+</Project>