#175 fixed

btc-ag · Nov 2, 2018 · 8a38eba · 8a38eba
1 parent fa753bf
commit 8a38eba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/com.btc.serviceidl/src/com/btc/serviceidl/generator/DefaultGenerationSettingsProvider.xtend b/com.btc.serviceidl/src/com/btc/serviceidl/generator/DefaultGenerationSettingsProvider.xtend
@@ -15,6 +15,7 @@ import com.btc.serviceidl.generator.common.PackageInfo
 import com.btc.serviceidl.generator.common.ProjectType
 import com.btc.serviceidl.generator.cpp.CppConstants
 import com.btc.serviceidl.generator.cpp.ServiceCommVersion
+import com.btc.serviceidl.generator.cpp.cab.CABModuleStructureStrategy
 import com.btc.serviceidl.generator.cpp.cmake.CMakeModuleStructureStrategy
 import com.btc.serviceidl.generator.cpp.cmake.CMakeProjectSetFactory
 import com.btc.serviceidl.generator.cpp.prins.PrinsModuleStructureStrategy
@@ -211,7 +212,12 @@ class DefaultGenerationSettingsProvider implements IGenerationSettingsProvider
             case Main.OPTION_VALUE_CPP_PROJECT_SYSTEM_CMAKE:
             {
                 result.projectSetFactory = new CMakeProjectSetFactory();
-                result.moduleStructureStrategy = new CMakeModuleStructureStrategy();
+                if(settings.projectTypes.exists[it == ProjectType.EXTERNAL_DB_IMPL])
+                {
+                    result.moduleStructureStrategy = new CMakeModuleStructureStrategy();
+                }
+                else
+                    result.moduleStructureStrategy = new CABModuleStructureStrategy();
             }
             case Main.OPTION_VALUE_CPP_PROJECT_SYSTEM_PRINS_VCXPROJ:
             {

diff --git a/...iceidl/src/com/btc/serviceidl/generator/cpp/cmake/CMakeTopLevelProjectFileGenerator.xtend b/...iceidl/src/com/btc/serviceidl/generator/cpp/cmake/CMakeTopLevelProjectFileGenerator.xtend
@@ -133,6 +133,7 @@ class CMakeTopLevelProjectFileGenerator
                 generators = "cmake"
                 short_paths = True
 
+                «IF projectSet.projects.exists[it.projectType == ProjectType.EXTERNAL_DB_IMPL]»
                 def generateODBFiles(self):
                     includedirs = ""
                     for includedir in self.deps_cpp_info["BTC.CAB.Commons"].includedirs:
@@ -152,6 +153,7 @@ class CMakeTopLevelProjectFileGenerator
                     self.run(odbbindir + '\\odb.exe --std c++11' + includedirs +
                         ' --multi-database dynamic --database common --database mssql --database oracle --generate-query --generate-prepared --generate-schema --schema-format embedded -x -Wno-unknown-pragmas -x -Wno-pragmas -x -Wno-literal-suffix -x -Wno-attributes --hxx-prologue "#include \"traits.hxx\"" --output-dir ' + odbdir + ' ' + odbdir + '\\«struct».hxx')
                     «ENDFOR»
+                «ENDIF»
 
                 def generateProtoFiles(self):
                     protofiles = glob.glob(self.source_folder + "/**/gen/*.proto", recursive=True)

diff --git a/....serviceidl/src/com/btc/serviceidl/generator/cpp/prins/PrinsModuleStructureStrategy.xtend b/....serviceidl/src/com/btc/serviceidl/generator/cpp/prins/PrinsModuleStructureStrategy.xtend
@@ -52,6 +52,6 @@ class PrinsModuleStructureStrategy implements IModuleStructureStrategy
 
     override getSourceFileDir()
     {
-        Path.fromPortableString("src")
+        Path.fromPortableString("source")
     }
 }