From d7ec481e9ef6bcbc211e2b1fc390fd439b7ed220 Mon Sep 17 00:00:00 2001 From: Lalit Sharma Date: Tue, 8 Dec 2020 08:52:35 -0800 Subject: [PATCH] Adding updates to checkout submodules --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 7 +------ Makefile | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 Makefile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a698695e..1d1b91b72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: # Define the steps to run the build job steps: - name: Checkout OpenFPGA repo - uses: actions/checkout@v2 + uses: actions/checkout@v2 with: submodules: true - name: Install dependency run: source ./.github/workflows/install_dependency.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index e8006a342..7b54219f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,13 +196,8 @@ include(CMakeParseArguments) ##project(yosys) -# Version number -set(YOSYS_VERSION_MAJOR 0.7) -set(YOSYS_VERSION_MINOR 0) -set(YOSYS_VERSION_PATCH 0) - # Options to enable/disable dependencies -option(YOSYS_ENABLE_TCL, "Enable TCL parser integrated in yosys" ON) +option(YOSYS_ENABLE_TCL, "Enable TCL parser integrated in yosys" OFF) option(YOSYS_ENABLE_ABC, "Enable ABC library integrated in yosys" ON) option(YOSYS_ENABLE_PLUGINS, "Enable plug-in in yosys" ON) option(YOSYS_ENABLE_READLINE, "Enable readline library in yosys" ON) diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..1f266bd5b --- /dev/null +++ b/Makefile @@ -0,0 +1,28 @@ +# Makefile + +ifeq ($(origin CMAKE_COMMAND),undefined) +CMAKE_COMMAND := cmake +else +CMAKE_COMMAND := ${CMAKE_COMMAND} +endif + +.PHONY: all env + +all: env + cd build && $(MAKE) + +clean: + rm -rf build + +env: + git submodule init + git submodule update --init --recursive + mkdir -p build && cd build && $(CMAKE_COMMAND) ${CMAKE_FLAGS} .. + +build/Makefile: + make env + +.PHONY: Makefile + +%: build/Makefile + cd build && $(MAKE) $@