post-rebase generate/update CMakeLists.txt files, update tox file

* includes fix timespec redefinition errors on windows * updates tox argument syntax on macos Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
berkeley-abc · Jul 23, 2023 · a6f8bfc · a6f8bfc
1 parent 37e91a3
commit a6f8bfc
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
             os: macOS-11
             compiler: xcode
             version: "12.4"
-            toxcmd: "base Xcode"
+            toxcmd: "base -- Xcode"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/src/aig/gia/CMakeLists.txt b/src/aig/gia/CMakeLists.txt
@@ -85,12 +85,14 @@ abc_libabc_add_sources(
         giaCSat3.c
         giaEra2.c
         giaIff.c
+        giaTranStoch.c
         giaSpeedup.c
         giaAiger.c
         gia.c
         giaDfs.c
         giaShrink7.c
         giaMem.c
+        giaTransduction.cpp
         giaSupMin.c
         giaStoch.c
         giaJf.c

diff --git a/src/aig/gia/giaTranStoch.c b/src/aig/gia/giaTranStoch.c
@@ -31,7 +31,7 @@
 
 #ifdef ABC_USE_PTHREADS
 
-#ifdef _WIN32
+#if (defined(_WIN32) && !defined(__MINGW32__))
 #include "../lib/pthread.h"
 #else
 #include <pthread.h>

diff --git a/src/base/abci/CMakeLists.txt b/src/base/abci/CMakeLists.txt
@@ -3,6 +3,7 @@ abc_libabc_add_sources(
     SOURCES
         abcFx.c
         abcLutmin.c
+        abcOrchestration.c
         abcMap.c
         abcExtract.c
         abcBm.c

diff --git a/src/base/io/CMakeLists.txt b/src/base/io/CMakeLists.txt
@@ -13,6 +13,7 @@ abc_libabc_add_sources(
         ioWriteVerilog.c
         ioReadPlaMo.c
         ioWritePla.c
+        ioWriteEdgelist.c
         ioWriteBaf.c
         ioWriteBench.c
         ioReadEdif.c

diff --git a/src/proof/ssw/sswPart.c b/src/proof/ssw/sswPart.c
@@ -25,7 +25,7 @@
 
 #ifdef ABC_USE_PTHREADS
 
-#ifdef _WIN32
+#if (defined(_WIN32) && !defined(__MINGW32__))
 #include "../lib/pthread.h"
 #else
 #include <pthread.h>

diff --git a/tox.ini b/tox.ini
@@ -74,10 +74,10 @@ commands =
     # eg:  CC=gcc CXX=g++ tox -e demo
     demo: bash -c '$CC {posargs} -Wall -c src/demo.c -o demo.o'
     demo: bash -c '$CXX -o demo demo.o libabc.a -lm -ldl -lreadline -lpthread'
-    demo: ./demo i10.aig
+    demo: bash -c './demo i10.aig'
     {abc,soname,tests}: bash -c 'ls -lh *abc* demo || true'
     base: bash -c 'cmake -G {posargs:"Ninja"} -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DCMAKE_INSTALL_PREFIX=$PREFIX -S . -B build'
-    base: cmake --build build --target install
+    base: cmake -j $(nproc) --build build --target install
     build: bash -c 'cmake -G {posargs:"Unix Makefiles"} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DABC_ENABLE_LTO=ON -DBUILD_SHARED_LIBS=ON -DABC_USE_SONAME=$ABC_USE_SONAME -DCMAKE_INSTALL_PREFIX=$PREFIX ..'
     clang: bash -c 'cmake -G {posargs:"Unix Makefiles"} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DCOVERAGE_BUILD=ON -DBUILD_SHARED_LIBS=OFF ..'
     {build}: bash -c 'cmake --build . -j $(nproc)'