The last definition of CharacterSet must win

Author: autoantwort

lib/importproject.cpp

@@ -905,14 +905,17 @@ bool ImportProject::importVcxproj(const std::string &filename, const tinyxml2::X
                     fs.defines += ";__AVX512__";
                 additionalIncludePaths += ';' + i.additionalIncludePaths;
             }
+            bool useUnicode = false;
             for (const ConfigurationPropertyGroup &c : configurationPropertyGroups) {
                 if (!c.conditionIsTrue(p))
                     continue;
-                if (c.useUnicode) {
-                    fs.defines += ";UNICODE=1;_UNICODE=1";
-                }
+                // in msbuild the last definition wins
+                useUnicode = c.useUnicode;
                 fs.useMfc = c.useOfMfc;
             }
+            if (useUnicode){
+                fs.defines += ";UNICODE=1;_UNICODE=1";
+            }
             fsSetDefines(fs, fs.defines);
             fsSetIncludePaths(fs, Path::getPathFromFilename(filename), toStringList(includePath + ';' + additionalIncludePaths), variables);
             for (const auto &path : sharedItemsIncludePaths) {

test/testimportproject.cpp

@@ -474,6 +474,10 @@ class TestImportProject : public TestFixture {
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <!-- Only to test that the last configuration entry overwrites this -->
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -501,6 +505,7 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS(project.fileSettings.size(), 2);
         ASSERT(project.fileSettings.front().defines.find(";UNICODE=1;") != std::string::npos);
         ASSERT(project.fileSettings.front().defines.find(";_UNICODE=1") != std::string::npos);
+        ASSERT(project.fileSettings.front().defines.find(";_UNICODE=1;") == std::string::npos); // No duplicates
         ASSERT_EQUALS(project.fileSettings.front().useMfc, false);
         ASSERT(project.fileSettings.back().defines.find(";UNICODE=1;") == std::string::npos);
         ASSERT(project.fileSettings.back().defines.find(";_UNICODE=1") == std::string::npos);