add OdbDesignApp executbale target back in

nam20485 · Jan 15, 2025 · b3724b9 · b3724b9
1 parent 91ab375
commit b3724b9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,7 +69,7 @@ endif()
 
 # Include sub-projects.
 add_subdirectory("OdbDesignLib")
-#add_subdirectory("OdbDesignApp")
+add_subdirectory("OdbDesignApp")
 add_subdirectory("OdbDesignServer")
 add_subdirectory("Utils")
 add_subdirectory("OdbDesignTests")
diff --git a/OdbDesignApp/CMakeLists.txt b/OdbDesignApp/CMakeLists.txt
@@ -5,4 +5,13 @@
 # Add source to this project's executable.
 add_executable (OdbDesignApp "OdbDesignApp.cpp" "OdbDesignApp.h"  )
 
+## PCH
+#if (NOT DEFINED ENV{CI})
+	file (GLOB_RECURSE ODBDESIGN_APP_HEADER_FILES "*.h")
+	target_precompile_headers(OdbDesignApp PRIVATE ${ODBDESIGN_APP_HEADER_FILES})
+#endif()
+
+# link to OdbDesign library
+target_link_libraries(OdbDesignApp PRIVATE OdbDesign)
+
 # TODO: Add tests and install targets if needed.
diff --git a/OdbDesignApp/OdbDesignApp.cpp b/OdbDesignApp/OdbDesignApp.cpp
@@ -5,6 +5,8 @@
 #include "macros.h"
 #include "ExitCode.h"
 #include <iostream>
+#include <FileModel/Design/LayerDirectory.h>
+#include <FileModel/Design/EdaDataFile.h>
 
 
 bool TestRigidFlexDesign();
@@ -39,7 +41,7 @@ int main()
 bool TestSampleDesign()
 {
     std::string sampleDesignPath;
-    if (Odb::Lib::IsMsvc())
+    if (Utils::IsWindows())
     {
         sampleDesignPath = R"(C:\Users\nmill\OneDrive\Documents\ODB++\Samples\sample_design.tgz)";
     }
@@ -63,7 +65,7 @@ bool TestSampleDesign()
 bool TestRigidFlexDesign()
 {   
     std::string rigidFlexDesignPath;
-    if (Odb::Lib::IsMsvc())
+    if (Utils::IsWindows())
     {
         rigidFlexDesignPath = R"(C:\Users\nmill\OneDrive\Documents\ODB++\Samples\designodb_rigidflex.tgz)";
     }
@@ -119,7 +121,7 @@ bool TestRigidFlexDesign()
 
         // layers
         auto& layersByName = pStep->GetLayersByName();
-        auto layerFind = layersByName.find(Odb::Lib::FileModel::Design::LayerDirectory::TOP_COMPONENTS_LAYER_NAME);
+        auto layerFind = layersByName.find(Odb::Lib::FileModel::Design::ComponentsFile::TOP_COMPONENTS_LAYER_NAME);
         if (layerFind != layersByName.end())
         {
             auto& pLayer = layerFind->second;
@@ -133,13 +135,10 @@ bool TestRigidFlexDesign()
         {
             auto& pNetlist = netlistFind->second;
             auto netlistName = pNetlist->GetName();
-            auto& netNames = pNetlist->GetNetNames();
-            for (auto& netName : netNames)
+            auto& netRecords = pNetlist->GetNetRecords();
+            for (auto& pNetRecord : netRecords)
             {
-                if (netName == "")
-                {
-
-                }
+
             }
         }
     }