diff options
| -rw-r--r-- | .github/workflows/build-posix-cmake.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/build-posix.yml (renamed from .github/disabled-workflows/build-posix.yml) | 0 | ||||
| -rw-r--r-- | .github/workflows/build-windows.yml (renamed from .github/disabled-workflows/build-windows.yml) | 0 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | README.md | 5 |
5 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/build-posix-cmake.yml b/.github/workflows/build-posix-cmake.yml index 68d325b2..ea31fe0b 100644 --- a/.github/workflows/build-posix-cmake.yml +++ b/.github/workflows/build-posix-cmake.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} env: - MAKE_ARGS: ${{ matrix.use_namespace && '-DABC_USE_NAMESPACE=ON' || '' }} + CMAKE_ARGS: ${{ matrix.use_namespace && '-DABC_USE_NAMESPACE=xxx' || '' }} DEMO_ARGS: ${{ matrix.use_namespace && '-DABC_NAMESPACE=xxx' || '' }} DEMO_GCC: ${{ matrix.use_namespace && 'g++ -x c++' || 'gcc' }} @@ -34,7 +34,7 @@ jobs: - name: Configure CMake run: | - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -B build + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${CMAKE_ARGS} -B build - name: Build CMake run: | @@ -53,7 +53,7 @@ jobs: - name: Stage Executable run: | mkdir staging - cp abc libabc.a staging/ + cp build/abc build/libabc.a staging/ - name: Upload pacakge artifact uses: actions/upload-artifact@v1 diff --git a/.github/disabled-workflows/build-posix.yml b/.github/workflows/build-posix.yml index aa97aca2..aa97aca2 100644 --- a/.github/disabled-workflows/build-posix.yml +++ b/.github/workflows/build-posix.yml diff --git a/.github/disabled-workflows/build-windows.yml b/.github/workflows/build-windows.yml index 6312780d..6312780d 100644 --- a/.github/disabled-workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cf6f19a..cee9bc72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,9 +47,14 @@ if(ABC_USE_NAMESPACE) set(ABC_USE_NAMESPACE_FLAGS "ABC_USE_NAMESPACE=${ABC_USE_NAMESPACE}") endif() +if( APPLE ) + set(make_env ${CMAKE_COMMAND} -E env SDKROOT=${CMAKE_OSX_SYSROOT}) +endif() + # run make to extract compiler options, linker options and list of source files execute_process( COMMAND + ${make_env} make ${ABC_READLINE_FLAGS} ${ABC_USE_NAMESPACE_FLAGS} @@ -1,5 +1,6 @@ -[](https://github.com/sterin/abc/actions/workflows/build-posix.yml) -[](https://github.com/sterin/abc/actions/workflows/build-windows.yml) +[](https://github.com/berkeley-abc/abc/actions/workflows/build-posix.yml) +[](https://github.com/berkeley-abc/abc/actions/workflows/build-windows.yml) +[](https://github.com/berkeley-abc/abc/actions/workflows/build-posix-cmake.yml) # ABC: System for Sequential Logic Synthesis and Formal Verification |