Feature: Add support for:

tapika · tapika · commit b72fa1d2767e · 2019-04-10T00:03:06.000+03:00
c.CCpp.Language.LanguageStandard = cpplang_stdcpp17;
c.CCpp.General.AdditionalIncludeDirectories = ...
Add sub tab for Optimization:
c.CCpp.Optimization.Optimization = optimization_Disabled;
diff --git a/SolutionProjectModel/ProjectFileTypes.h b/SolutionProjectModel/ProjectFileTypes.h
@@ -298,11 +298,55 @@ DECLARE_ENUM(EOptimization, "optimization_",
     optimization_ProjectDefault
 );
 
+
+DECLARE_ENUM(ELanguageStandard, "cpplang_",
+
+    // ISO C++14 Standard (/std:c++14)
+    cpplang_stdcpp14,
+
+    // ISO C++17 Standard (/std:c++17)
+    cpplang_stdcpp17,
+
+    // ISO C++ Latest Draft Standard (/std:c++latest)
+    cpplang_stdcpplatest
+);
+
+
+
+class SPM_DLLEXPORT CCppGeneralConf : public ReflectClassT<CCppGeneralConf>
+{
+public:
+    REFLECTABLE(CCppGeneralConf,
+
+        // Additional Include Directories, ';' separated list.
+        (CStringW)AdditionalIncludeDirectories
+    );
+};
+
+class SPM_DLLEXPORT CCppOptimizationConf : public ReflectClassT<CCppOptimizationConf>
+{
+public:
+    REFLECTABLE(CCppOptimizationConf,
+        (EOptimization)Optimization
+    );
+};
+
+class SPM_DLLEXPORT CCppLanguageConf : public ReflectClassT<CCppLanguageConf>
+{
+public:
+    REFLECTABLE(CCppLanguageConf,
+        (ELanguageStandard)LanguageStandard
+    );
+};
+
+
 class SPM_DLLEXPORT CCppConf: public ReflectClassT<CCppConf>
 {
 public:
     REFLECTABLE(CCppConf,
-        (EOptimization)Optimization
+        (CCppGeneralConf)General,
+        (CCppOptimizationConf)Optimization,
+        (CCppLanguageConf)Language
     );
 };
 
diff --git a/SolutionProjectModel/cppexec/cppexec.cpp b/SolutionProjectModel/cppexec/cppexec.cpp
@@ -22,10 +22,10 @@ class CommandLineArguments : ReflectClassT<CommandLineArguments>
 int wmain(int argc, wchar_t** argv)
 {
     path exePath(argv[0]);
-    auto dir = weakly_canonical(exePath).parent_path();
+    auto exeDir = weakly_canonical(exePath).parent_path();
     path scriptToRun;
 
-    for (auto& pit : directory_iterator(dir))
+    for (auto& pit : directory_iterator(exeDir))
     {
         auto& filePath = pit.path();
         auto ext = filePath.extension();
@@ -104,13 +104,15 @@ int wmain(int argc, wchar_t** argv)
         p.AddFile(scriptToRun.c_str());
 
         p.VisitConfigurations(
-            [](VCConfiguration& c)
+            [&](VCConfiguration& c)
             {
                 c.General.IntDir = LR"(obj\$(ProjectName)_$(Configuration)_$(Platform)\)";
                 c.General.OutDir = LR"(.\)";
                 c.General.UseDebugLibraries = true;
                 c.General.LinkIncremental = true;
-                c.CCpp.Optimization = optimization_Disabled;
+                c.CCpp.Optimization.Optimization = optimization_Disabled;
+                c.CCpp.General.AdditionalIncludeDirectories = exeDir.append("SolutionProjectModel").c_str();
+                c.CCpp.Language.LanguageStandard = cpplang_stdcpp17;
                 c.Linker.System.SubSystem = subsystem_Windows;
                 c.Linker.Debugging.GenerateDebugInformation = debuginfo_true;
             }
diff --git a/SolutionProjectModel/testCppApp.cpp b/SolutionProjectModel/testCppApp.cpp
@@ -19,7 +19,7 @@ void main(void)
             c.General.OutDir = LR"(bin\$(Configuration)_$(Platform)\)";
             c.General.UseDebugLibraries = true;
             c.General.LinkIncremental = true;
-            c.CCpp.Optimization = optimization_Disabled;
+            c.CCpp.Optimization.Optimization = optimization_Disabled;
             c.Linker.System.SubSystem = subsystem_Console;
             c.Linker.Debugging.GenerateDebugInformation = debuginfo_true;
         }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void main(void)`
`19`	`19`	`c.General.OutDir = LR"(bin\$(Configuration)_$(Platform)\)";`
`20`	`20`	`c.General.UseDebugLibraries = true;`
`21`	`21`	`c.General.LinkIncremental = true;`
`22`		`- c.CCpp.Optimization = optimization_Disabled;`
	`22`	`+ c.CCpp.Optimization.Optimization = optimization_Disabled;`
`23`	`23`	`c.Linker.System.SubSystem = subsystem_Console;`
`24`	`24`	`c.Linker.Debugging.GenerateDebugInformation = debuginfo_true;`
`25`	`25`	`}`