From 5068affef4fd2e7ad26423160bb4e26d3db008a3 Mon Sep 17 00:00:00 2001 From: Alexander Martynov Date: Thu, 21 Apr 2022 23:07:35 +0300 Subject: [PATCH 1/7] Added sln/vcxproj/props files to build with MSVC --- .gitignore | 2 + _prj_msvc/props/umba_3dp_boost.props | 6 +++ _prj_msvc/props/umba_3dp_jinja2cpp.props | 16 ++++++ _prj_msvc/props/umba_3dp_llvm.props | 45 ++++++++++++++++ _prj_msvc/props/umba_3dp_qtdir.props | 51 ++++++++++++++++++ _prj_msvc/props/umba_common.props | 17 ++++++ .../props/umba_config_matrix_common.props | 54 +++++++++++++++++++ _prj_msvc/props/umba_config_matrix_qt.props | 33 ++++++++++++ .../props/umba_local_common_prjdirs.props | 19 +++++++ _prj_msvc/props/umba_msvcver.props | 24 +++++++++ .../props/umba_project_configurations.props | 37 +++++++++++++ _prj_msvc/props/umba_qt_common.props | 19 +++++++ _prj_msvc/props/umba_target_console.props | 19 +++++++ _prj_msvc/props/umba_target_lib_static.props | 19 +++++++ _prj_msvc/props/umba_target_utility.props | 16 ++++++ _prj_msvc/umba_prjdefs.props | 9 ++++ _prj_msvc/umba_prjdirs.props | 22 ++++++++ _prj_msvc/yaml-cpp.vcxproj | 52 ++++++++++++++++++ _prj_msvc/yaml-cpp.vcxproj.user | 4 ++ _prj_msvc/yaml_cpp.props | 38 +++++++++++++ gen-msvc2017-sln.bat | 4 ++ yaml-cpp-msvc2017.sln | 41 ++++++++++++++ yaml-cpp-msvc2019.sln | 41 ++++++++++++++ 23 files changed, 588 insertions(+) create mode 100644 _prj_msvc/props/umba_3dp_boost.props create mode 100644 _prj_msvc/props/umba_3dp_jinja2cpp.props create mode 100644 _prj_msvc/props/umba_3dp_llvm.props create mode 100644 _prj_msvc/props/umba_3dp_qtdir.props create mode 100644 _prj_msvc/props/umba_common.props create mode 100644 _prj_msvc/props/umba_config_matrix_common.props create mode 100644 _prj_msvc/props/umba_config_matrix_qt.props create mode 100644 _prj_msvc/props/umba_local_common_prjdirs.props create mode 100644 _prj_msvc/props/umba_msvcver.props create mode 100644 _prj_msvc/props/umba_project_configurations.props create mode 100644 _prj_msvc/props/umba_qt_common.props create mode 100644 _prj_msvc/props/umba_target_console.props create mode 100644 _prj_msvc/props/umba_target_lib_static.props create mode 100644 _prj_msvc/props/umba_target_utility.props create mode 100644 _prj_msvc/umba_prjdefs.props create mode 100644 _prj_msvc/umba_prjdirs.props create mode 100644 _prj_msvc/yaml-cpp.vcxproj create mode 100644 _prj_msvc/yaml-cpp.vcxproj.user create mode 100644 _prj_msvc/yaml_cpp.props create mode 100644 gen-msvc2017-sln.bat create mode 100644 yaml-cpp-msvc2017.sln create mode 100644 yaml-cpp-msvc2019.sln diff --git a/.gitignore b/.gitignore index 2f9d10f06..696a274f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ build/ /tags /bazel-* +/.vs +/.out diff --git a/_prj_msvc/props/umba_3dp_boost.props b/_prj_msvc/props/umba_3dp_boost.props new file mode 100644 index 000000000..027ee8423 --- /dev/null +++ b/_prj_msvc/props/umba_3dp_boost.props @@ -0,0 +1,6 @@ + + + $(BOOST_1_75_0_ROOT) + $(BOOST)\stage\lib + + diff --git a/_prj_msvc/props/umba_3dp_jinja2cpp.props b/_prj_msvc/props/umba_3dp_jinja2cpp.props new file mode 100644 index 000000000..f8cdd4217 --- /dev/null +++ b/_prj_msvc/props/umba_3dp_jinja2cpp.props @@ -0,0 +1,16 @@ + + + + + + + + $(JINJA2CPP_BUILT_ROOT)\$(UMBA_TOOLSET_PLATFORM_CONFIG_ROOT) + $(JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT)\include + $(JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT)\lib;$(JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT)\lib\static + + + diff --git a/_prj_msvc/props/umba_3dp_llvm.props b/_prj_msvc/props/umba_3dp_llvm.props new file mode 100644 index 000000000..9f2f6f5fd --- /dev/null +++ b/_prj_msvc/props/umba_3dp_llvm.props @@ -0,0 +1,45 @@ + + + + + + $(UMBA_MSVCVER) + + + + $(UMBA_LLVM_BUILT_ROOT)\$(UMBA_LLVM_TOOLSET) + + + + + $(LLVM_LIB_ROOT)\$(PlatformShortName)\include;$(LLVM_LIB_ROOT)\$(PlatformShortName)\tools\clang\include + + + + + $(UMBA_LLVM_PROJECT_ROOT)\llvm\include;$(UMBA_LLVM_PROJECT_ROOT)\clang\include;$(UMBA_LLVM_CLANG_TOOLSET_PLATFORM_CONFIG_ARTIFACTS_INC) + $(UMBA_LLVM_PROJECT_ROOT)\clang-tools-extra + $(LLVM_LIB_ROOT)\$(PlatformShortName)\$(Configuration)\lib + $(LLVM_LIB_ROOT)\$(PlatformShortName)\$(Configuration)\bin + + + diff --git a/_prj_msvc/props/umba_3dp_qtdir.props b/_prj_msvc/props/umba_3dp_qtdir.props new file mode 100644 index 000000000..8fc51d7fc --- /dev/null +++ b/_prj_msvc/props/umba_3dp_qtdir.props @@ -0,0 +1,51 @@ + + + + $(MSVC2017_QTROOT)\msvc2017 + + + $(MSVC2019_QTROOT)\msvc2017 + + + + $(UMBA_QT_ROOT)\msvc2017 + + + $(UMBA_QT_ROOT)\msvc2017 + + + $(UMBA_QT_ROOT)\msvc2017_64 + + + $(UMBA_QT_ROOT)\msvc2017_64 + + + + $(QTDIR)\bin + $(QTDIR)\bin + $(QTDIR)\lib + $(QTDIR)\include + + + + + $(MSVC2017_QWT_ROOT) + + + $(QWT_ROOT_PATH) + + $(QWT_ROOT_PATH)\$(PlatformShortName)\lib + $(QWT_ROOT_PATH)\$(PlatformShortName)\lib + $(QWT_ROOT_PATH)\$(PlatformShortName)\include + + + $(QWT_LIB_PATH) + $(QWT_INC_PATH) + + + + + PATH=$(QWT_DLL_PATH);$(QT_DLL_PATH);$(PATH);$(LocalDebuggerEnvironment) + + + diff --git a/_prj_msvc/props/umba_common.props b/_prj_msvc/props/umba_common.props new file mode 100644 index 000000000..82fef6d4f --- /dev/null +++ b/_prj_msvc/props/umba_common.props @@ -0,0 +1,17 @@ + + + + + + + + + $(PlatformShortName)\$(Configuration) + + + + $(UMBA_MSVCVER)\$(UMBA_PLATFORM_CONFIG_ROOT) + + + + diff --git a/_prj_msvc/props/umba_config_matrix_common.props b/_prj_msvc/props/umba_config_matrix_common.props new file mode 100644 index 000000000..18de3564a --- /dev/null +++ b/_prj_msvc/props/umba_config_matrix_common.props @@ -0,0 +1,54 @@ + + + + + WIN32;WIN64;%(PreprocessorDefinitions) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + + + true + true + + + + + + WIN32;%(PreprocessorDefinitions) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + + + true + true + + + + + + WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) + + MultiThreadedDLL + + + false + true + + + + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + + + MultiThreadedDLL + + + false + true + + + + diff --git a/_prj_msvc/props/umba_config_matrix_qt.props b/_prj_msvc/props/umba_config_matrix_qt.props new file mode 100644 index 000000000..edb020cb7 --- /dev/null +++ b/_prj_msvc/props/umba_config_matrix_qt.props @@ -0,0 +1,33 @@ + + + + + + + UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories);$(ProjectDir)\..\.. + + + + + + UNICODE;_UNICODE;WIN32;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + + + + UNICODE;_UNICODE;WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + + + + UNICODE;_UNICODE;WIN32;NDEBUG;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + + diff --git a/_prj_msvc/props/umba_local_common_prjdirs.props b/_prj_msvc/props/umba_local_common_prjdirs.props new file mode 100644 index 000000000..bc3c91a44 --- /dev/null +++ b/_prj_msvc/props/umba_local_common_prjdirs.props @@ -0,0 +1,19 @@ + + + + + $(ProjectDir)\..\_libs + $(UMBA_LOCAL_LIBS_ROOT)\pretty_headers;$(UMBA_LOCAL_LIBS_ROOT)\_pretty_headers;$(UMBA_LOCAL_LIBS_ROOT)\std_headers;$(UMBA_LOCAL_LIBS_ROOT)\_std_headers;$(UMBA_LOCAL_LIBS_ROOT)\qt_headers;$(UMBA_LOCAL_LIBS_ROOT)\_qt_headers;$(UMBA_LOCAL_LIBS_ROOT)\qt5_headers;$(UMBA_LOCAL_LIBS_ROOT)\_qt5_headers;$(UMBA_LOCAL_LIBS_ROOT)\qt6_headers;$(UMBA_LOCAL_LIBS_ROOT)\_qt6_headers + $(UMBA_LOCAL_LIBS_ROOT);$(UMBA_LOCAL_PRETTY_HEADERS);$(ProjectDir)\..\src;$(UMBA_LOCAL_LIBS_ROOT)\sfmt\inc;$(UMBA_LOCAL_LIBS_ROOT)\mem_pools\inc + + $(SolutionDir)\.out\$(UMBA_TOOLSET_PLATFORM_CONFIG_ROOT) + + + + + $(UMBA_OUTDIR)\ + $(UMBA_OUTDIR)\_$(ProjectName)\ + + + + diff --git a/_prj_msvc/props/umba_msvcver.props b/_prj_msvc/props/umba_msvcver.props new file mode 100644 index 000000000..ee5c1823c --- /dev/null +++ b/_prj_msvc/props/umba_msvcver.props @@ -0,0 +1,24 @@ + + + + msvc_$(VisualStudioVersion) + + + + msvc2017 + 10.0.16299.0 + v141 + + + + msvc2019 + 10.0 + v142 + + + + msvc2022 + v143 + + + diff --git a/_prj_msvc/props/umba_project_configurations.props b/_prj_msvc/props/umba_project_configurations.props new file mode 100644 index 000000000..5df3f6644 --- /dev/null +++ b/_prj_msvc/props/umba_project_configurations.props @@ -0,0 +1,37 @@ + + + + + + Debug + Win32 + + + + Debug + x64 + + + + Release + Win32 + + + + Release + x64 + + + + RelWithDebInfo + Win32 + + + + MinSizeRel + x64 + + + + + diff --git a/_prj_msvc/props/umba_qt_common.props b/_prj_msvc/props/umba_qt_common.props new file mode 100644 index 000000000..aacc381d4 --- /dev/null +++ b/_prj_msvc/props/umba_qt_common.props @@ -0,0 +1,19 @@ + + + + + + $(UMBA_OUTDIR)\_$(ProjectName)\GeneratedFiles + + + + + $(QT_GENERATED_PATH);$(QT_INC_PATH);%(AdditionalIncludeDirectories) + + + STRICT;WIN32_LEAN_AND_MEAN;USE_UMBA_LOUT_COUT;%(PreprocessorDefinitions) + $(UMBA_INC_DIRS);$(QT_GENERATED_PATH);$(QT_INC_PATH);%(AdditionalIncludeDirectories) + + + + diff --git a/_prj_msvc/props/umba_target_console.props b/_prj_msvc/props/umba_target_console.props new file mode 100644 index 000000000..c139f4ac2 --- /dev/null +++ b/_prj_msvc/props/umba_target_console.props @@ -0,0 +1,19 @@ + + + + Application + + + + + USE_UMBA_LOUT_COUT;%(PreprocessorDefinitions) + + + Console + $(OutDir)\$(ProjectName).exe + $(OutDir);%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + diff --git a/_prj_msvc/props/umba_target_lib_static.props b/_prj_msvc/props/umba_target_lib_static.props new file mode 100644 index 000000000..8043a197d --- /dev/null +++ b/_prj_msvc/props/umba_target_lib_static.props @@ -0,0 +1,19 @@ + + + + StaticLibrary + + + + + %(PreprocessorDefinitions) + + + Console + $(OutDir)\$(ProjectName).lib + $(OutDir);%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + diff --git a/_prj_msvc/props/umba_target_utility.props b/_prj_msvc/props/umba_target_utility.props new file mode 100644 index 000000000..4df5dbb87 --- /dev/null +++ b/_prj_msvc/props/umba_target_utility.props @@ -0,0 +1,16 @@ + + + + Utility + + + + + Console + $(OutDir)\$(ProjectName) + $(OutDir);%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + diff --git a/_prj_msvc/umba_prjdefs.props b/_prj_msvc/umba_prjdefs.props new file mode 100644 index 000000000..01f643cbd --- /dev/null +++ b/_prj_msvc/umba_prjdefs.props @@ -0,0 +1,9 @@ + + + + + YAML_CPP_STATIC_DEFINE;%(PreprocessorDefinitions) + + + + diff --git a/_prj_msvc/umba_prjdirs.props b/_prj_msvc/umba_prjdirs.props new file mode 100644 index 000000000..468000bca --- /dev/null +++ b/_prj_msvc/umba_prjdirs.props @@ -0,0 +1,22 @@ + + + + + + + + + + + $(ProjectDir)\.. + $(YAML_CPP_ROOT)\include + + $(YAML_CPP_INC) + $(UMBA_LOCAL_INC_DIRS);$(UMBA_INC_DIRS_EXTRA) + + + $(UMBA_LOCAL_LIB_DIRS);$(UMBA_INC_DIRS_EXTRA) + + + + diff --git a/_prj_msvc/yaml-cpp.vcxproj b/_prj_msvc/yaml-cpp.vcxproj new file mode 100644 index 000000000..bfb8ebb44 --- /dev/null +++ b/_prj_msvc/yaml-cpp.vcxproj @@ -0,0 +1,52 @@ + + + + + {001634AE-5567-412E-ACEC-6EC488026C66} + + + + + + + + + + + + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(UMBA_INC_DIRS) + + + + + + + + + + + + true + UNICODE;_UNICODE;%(PreprocessorDefinitions) + $(UMBA_INC_DIRS);%(AdditionalIncludeDirectories) + true + stdcpp17 + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + + + + + + + + + \ No newline at end of file diff --git a/_prj_msvc/yaml-cpp.vcxproj.user b/_prj_msvc/yaml-cpp.vcxproj.user new file mode 100644 index 000000000..88a550947 --- /dev/null +++ b/_prj_msvc/yaml-cpp.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/_prj_msvc/yaml_cpp.props b/_prj_msvc/yaml_cpp.props new file mode 100644 index 000000000..fa9a2c79a --- /dev/null +++ b/_prj_msvc/yaml_cpp.props @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gen-msvc2017-sln.bat b/gen-msvc2017-sln.bat new file mode 100644 index 000000000..b62806fbf --- /dev/null +++ b/gen-msvc2017-sln.bat @@ -0,0 +1,4 @@ +umba-subst-macros --overwrite --raw ^ +--set="Visual Studio Version 16:Visual Studio 15" ^ +--set="VisualStudioVersion = 16.:VisualStudioVersion = 15" ^ +yaml-cpp-msvc2019.sln yaml-cpp-msvc2017.sln diff --git a/yaml-cpp-msvc2017.sln b/yaml-cpp-msvc2017.sln new file mode 100644 index 000000000..5415550b6 --- /dev/null +++ b/yaml-cpp-msvc2017.sln @@ -0,0 +1,41 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 150.31205.134 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "_prj_msvc\yaml-cpp.vcxproj", "{001634AE-5567-412E-ACEC-6EC488026C66}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + MinSizeRel|x64 = MinSizeRel|x64 + MinSizeRel|x86 = MinSizeRel|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + RelWithDebInfo|x64 = RelWithDebInfo|x64 + RelWithDebInfo|x86 = RelWithDebInfo|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.ActiveCfg = Debug|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.Build.0 = Debug|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.ActiveCfg = Debug|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.Build.0 = Debug|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.ActiveCfg = Release|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.Build.0 = Release|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.ActiveCfg = Release|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.Build.0 = Release|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5E0C8F56-E644-47AC-B47B-157E9451A52E} + EndGlobalSection +EndGlobal diff --git a/yaml-cpp-msvc2019.sln b/yaml-cpp-msvc2019.sln new file mode 100644 index 000000000..7f78bf64f --- /dev/null +++ b/yaml-cpp-msvc2019.sln @@ -0,0 +1,41 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "_prj_msvc\yaml-cpp.vcxproj", "{001634AE-5567-412E-ACEC-6EC488026C66}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + MinSizeRel|x64 = MinSizeRel|x64 + MinSizeRel|x86 = MinSizeRel|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + RelWithDebInfo|x64 = RelWithDebInfo|x64 + RelWithDebInfo|x86 = RelWithDebInfo|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.ActiveCfg = Debug|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.Build.0 = Debug|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.ActiveCfg = Debug|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.Build.0 = Debug|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.ActiveCfg = Release|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.Build.0 = Release|x64 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.ActiveCfg = Release|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.Build.0 = Release|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 + {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5E0C8F56-E644-47AC-B47B-157E9451A52E} + EndGlobalSection +EndGlobal From 54ebaf758785814dfe452c649d8bf369550b03a7 Mon Sep 17 00:00:00 2001 From: Alexander Martynov Date: Thu, 21 Apr 2022 23:33:46 +0300 Subject: [PATCH 2/7] Updated props files --- _prj_msvc/props/umba_config_matrix_common.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_prj_msvc/props/umba_config_matrix_common.props b/_prj_msvc/props/umba_config_matrix_common.props index 18de3564a..7702a77d3 100644 --- a/_prj_msvc/props/umba_config_matrix_common.props +++ b/_prj_msvc/props/umba_config_matrix_common.props @@ -2,7 +2,7 @@ - WIN32;WIN64;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -15,7 +15,7 @@ - WIN32;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;%(PreprocessorDefinitions) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -28,7 +28,7 @@ - WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL @@ -40,7 +40,7 @@ - WIN32;NDEBUG;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL From f65e6fbbed3b3205e89c19cc2ae6ec600019a991 Mon Sep 17 00:00:00 2001 From: Alexander Martynov Date: Thu, 21 Apr 2022 23:38:48 +0300 Subject: [PATCH 3/7] Updated vcxproj file --- _prj_msvc/yaml-cpp.vcxproj | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/_prj_msvc/yaml-cpp.vcxproj b/_prj_msvc/yaml-cpp.vcxproj index bfb8ebb44..f6a7922b5 100644 --- a/_prj_msvc/yaml-cpp.vcxproj +++ b/_prj_msvc/yaml-cpp.vcxproj @@ -25,22 +25,6 @@ - - - - true - UNICODE;_UNICODE;%(PreprocessorDefinitions) - $(UMBA_INC_DIRS);%(AdditionalIncludeDirectories) - true - stdcpp17 - - - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - From 13f043696db7a38976c5fdec55aef99a830ff167 Mon Sep 17 00:00:00 2001 From: Alexander Martynov Date: Thu, 21 Apr 2022 23:57:53 +0300 Subject: [PATCH 4/7] Fixed props --- _prj_msvc/props/umba_common.props | 2 ++ _prj_msvc/props/umba_stdcpp14.props | 9 +++++++++ _prj_msvc/props/umba_stdcpp17.props | 9 +++++++++ _prj_msvc/props/umba_stdcpp20.props | 9 +++++++++ _prj_msvc/umba_prjdefs.props | 6 ++++++ 5 files changed, 35 insertions(+) create mode 100644 _prj_msvc/props/umba_stdcpp14.props create mode 100644 _prj_msvc/props/umba_stdcpp17.props create mode 100644 _prj_msvc/props/umba_stdcpp20.props diff --git a/_prj_msvc/props/umba_common.props b/_prj_msvc/props/umba_common.props index 82fef6d4f..af1a05324 100644 --- a/_prj_msvc/props/umba_common.props +++ b/_prj_msvc/props/umba_common.props @@ -2,6 +2,8 @@ + + diff --git a/_prj_msvc/props/umba_stdcpp14.props b/_prj_msvc/props/umba_stdcpp14.props new file mode 100644 index 000000000..fb9a532f0 --- /dev/null +++ b/_prj_msvc/props/umba_stdcpp14.props @@ -0,0 +1,9 @@ + + + + + stdcpp14 + + + + diff --git a/_prj_msvc/props/umba_stdcpp17.props b/_prj_msvc/props/umba_stdcpp17.props new file mode 100644 index 000000000..45738a5ec --- /dev/null +++ b/_prj_msvc/props/umba_stdcpp17.props @@ -0,0 +1,9 @@ + + + + + stdcpp17 + + + + diff --git a/_prj_msvc/props/umba_stdcpp20.props b/_prj_msvc/props/umba_stdcpp20.props new file mode 100644 index 000000000..ef70efad1 --- /dev/null +++ b/_prj_msvc/props/umba_stdcpp20.props @@ -0,0 +1,9 @@ + + + + + stdcpp20 + + + + diff --git a/_prj_msvc/umba_prjdefs.props b/_prj_msvc/umba_prjdefs.props index 01f643cbd..63a2e5223 100644 --- a/_prj_msvc/umba_prjdefs.props +++ b/_prj_msvc/umba_prjdefs.props @@ -1,9 +1,15 @@ + + YAML_CPP_STATIC_DEFINE;%(PreprocessorDefinitions) + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + From 6a6e763d9c946213362384d31b9ff2d7b4fb50c7 Mon Sep 17 00:00:00 2001 From: al-martyn1 Date: Thu, 21 Dec 2023 11:34:08 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _prj_msvc/yaml_cpp.props | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_prj_msvc/yaml_cpp.props b/_prj_msvc/yaml_cpp.props index fa9a2c79a..b4db9de94 100644 --- a/_prj_msvc/yaml_cpp.props +++ b/_prj_msvc/yaml_cpp.props @@ -1,5 +1,11 @@ + + + YAML_CPP_STATIC_DEFINE;%(PreprocessorDefinitions) + + + From f74a6f324518d6ef94f8709179fcde98cacd22c2 Mon Sep 17 00:00:00 2001 From: al-martyn1 Date: Sat, 4 May 2024 13:49:12 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20GUID=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _prj_msvc/yaml-cpp.vcxproj | 2 +- yaml-cpp-msvc2017.sln | 30 +++++++++++++++--------------- yaml-cpp-msvc2019.sln | 30 +++++++++++++++--------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/_prj_msvc/yaml-cpp.vcxproj b/_prj_msvc/yaml-cpp.vcxproj index f6a7922b5..ae13ce6e4 100644 --- a/_prj_msvc/yaml-cpp.vcxproj +++ b/_prj_msvc/yaml-cpp.vcxproj @@ -2,7 +2,7 @@ - {001634AE-5567-412E-ACEC-6EC488026C66} + {5E9F7FDF-0402-4004-98FD-01852CF7477E} diff --git a/yaml-cpp-msvc2017.sln b/yaml-cpp-msvc2017.sln index 5415550b6..187f306a0 100644 --- a/yaml-cpp-msvc2017.sln +++ b/yaml-cpp-msvc2017.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 150.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "_prj_msvc\yaml-cpp.vcxproj", "{001634AE-5567-412E-ACEC-6EC488026C66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "_prj_msvc\yaml-cpp.vcxproj", "{5E9F7FDF-0402-4004-98FD-01852CF7477E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,20 +17,20 @@ Global RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.ActiveCfg = Debug|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.Build.0 = Debug|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.ActiveCfg = Debug|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.Build.0 = Debug|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.ActiveCfg = Release|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.Build.0 = Release|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.ActiveCfg = Release|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.Build.0 = Release|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x64.ActiveCfg = Debug|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x64.Build.0 = Debug|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x86.ActiveCfg = Debug|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x86.Build.0 = Debug|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x64.ActiveCfg = Release|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x64.Build.0 = Release|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x86.ActiveCfg = Release|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x86.Build.0 = Release|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/yaml-cpp-msvc2019.sln b/yaml-cpp-msvc2019.sln index 7f78bf64f..de9a94b13 100644 --- a/yaml-cpp-msvc2019.sln +++ b/yaml-cpp-msvc2019.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "_prj_msvc\yaml-cpp.vcxproj", "{001634AE-5567-412E-ACEC-6EC488026C66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "_prj_msvc\yaml-cpp.vcxproj", "{5E9F7FDF-0402-4004-98FD-01852CF7477E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,20 +17,20 @@ Global RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.ActiveCfg = Debug|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x64.Build.0 = Debug|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.ActiveCfg = Debug|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.Debug|x86.Build.0 = Debug|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.ActiveCfg = Release|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x64.Build.0 = Release|x64 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.ActiveCfg = Release|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.Release|x86.Build.0 = Release|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 - {001634AE-5567-412E-ACEC-6EC488026C66}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x64.ActiveCfg = Debug|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x64.Build.0 = Debug|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x86.ActiveCfg = Debug|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Debug|x86.Build.0 = Debug|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x64.ActiveCfg = Release|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x64.Build.0 = Release|x64 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x86.ActiveCfg = Release|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.Release|x86.Build.0 = Release|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 + {5E9F7FDF-0402-4004-98FD-01852CF7477E}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 1d89a44f6861dbcb43c7335ce257370fa74ff9ef Mon Sep 17 00:00:00 2001 From: al-martyn1 Date: Thu, 18 Sep 2025 00:05:07 +0300 Subject: [PATCH 7/7] Applied Tim-S fix yaml-cpp build with Visual Studio Code 2019 #1364 - https://github.com/jbeder/yaml-cpp/pull/1364/files --- src/contrib/dragonbox.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/contrib/dragonbox.h b/src/contrib/dragonbox.h index 499a1576e..2a9552000 100644 --- a/src/contrib/dragonbox.h +++ b/src/contrib/dragonbox.h @@ -937,9 +937,16 @@ namespace jkj { return false; } + // https://github.com/jbeder/yaml-cpp/pull/1364/files + template