Move libabc dep to only cut

maliberty · maliberty · commit 43673367bf99 · 2025-09-09T06:00:04.000Z
Signed-off-by: Matt Liberty &lt;mliberty@precisioninno.com&gt;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -94,7 +94,6 @@ if(USE_SYSTEM_ABC)
   if(NOT ABC_INCLUDE_DIR)
     set(ABC_INCLUDE_DIR "/usr/include/abc")
   endif()
-  add_definitions(-DABC_USE_STDINT_H=1)
   include_directories(${ABC_INCLUDE_DIR})
   message(STATUS "Using ABC_INCLUDE_DIR=${ABC_INCLUDE_DIR}")
 else()
diff --git a/src/cgt/src/CMakeLists.txt b/src/cgt/src/CMakeLists.txt
@@ -37,7 +37,6 @@ target_link_libraries(cgt
     OpenSTA
     cut
     dbSta_lib
-    libabc
     utl_lib
  )
 
@@ -64,7 +63,6 @@ if (Python3_FOUND AND BUILD_PYTHON)
       dbSta
       OpenSTA
       cut
-      libabc
   )
 
 endif()
diff --git a/src/cut/src/CMakeLists.txt b/src/cut/src/CMakeLists.txt
@@ -24,15 +24,20 @@ target_sources(cut
     logic_cut.cpp
 )
 
+target_compile_definitions(cut
+  PUBLIC
+    ABC_USE_STDINT_H=1
+)
+
 target_link_libraries(cut
   PUBLIC
     rsz_lib
+    libabc
   PRIVATE
     odb
     dbSta
     OpenSTA
     dbSta_lib
-    libabc
     utl_lib
     ${ABC_LIBRARY}
  )
diff --git a/src/rmp/test/cpp/CMakeLists.txt b/src/rmp/test/cpp/CMakeLists.txt
@@ -9,14 +9,13 @@ target_link_libraries(RmpGTests
         dbSta_lib
         rsz_lib
         utl_lib
-        libabc
+        cut
         rmp_lib
         ${TCL_LIBRARY}
 )
 
 target_include_directories(RmpGTests
     PRIVATE
-      ${PROJECT_SOURCE_DIR}/src/cut/include
       ${PROJECT_SOURCE_DIR}/src/rmp/src
 )
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ target_link_libraries(cgt`
`37`	`37`	`OpenSTA`
`38`	`38`	`cut`
`39`	`39`	`dbSta_lib`
`40`		`- libabc`
`41`	`40`	`utl_lib`
`42`	`41`	`)`
`43`	`42`
`@@ -64,7 +63,6 @@ if (Python3_FOUND AND BUILD_PYTHON)`
`64`	`63`	`dbSta`
`65`	`64`	`OpenSTA`
`66`	`65`	`cut`
`67`		`- libabc`
`68`	`66`	`)`
`69`	`67`
`70`	`68`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,13 @@ target_link_libraries(RmpGTests`
`9`	`9`	`dbSta_lib`
`10`	`10`	`rsz_lib`
`11`	`11`	`utl_lib`
`12`		`- libabc`
	`12`	`+ cut`
`13`	`13`	`rmp_lib`
`14`	`14`	`${TCL_LIBRARY}`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`target_include_directories(RmpGTests`
`18`	`18`	`PRIVATE`
`19`		`- ${PROJECT_SOURCE_DIR}/src/cut/include`
`20`	`19`	`${PROJECT_SOURCE_DIR}/src/rmp/src`
`21`	`20`	`)`
`22`	`21`