diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b953d9b2..35a2296c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,14 +312,14 @@ endif() # we will check if yosys already exist. if not then build it if (OPENFPGA_WITH_YOSYS) - if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/yosys) + if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/yosys/bin/yosys) message(STATUS "Yosys pre-build exist so skipping it") else () # run makefile provided, we pass-on the options to the local make file add_custom_target( yosys ALL COMMAND $(MAKE) config-gcc - COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_BINARY_DIR}/yosys + COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_BINARY_DIR}/yosys/ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys COMMENT "Compile Yosys with given Makefile" ) @@ -331,7 +331,7 @@ if (OPENFPGA_WITH_YOSYS) yosys-plugins ALL COMMAND $(MAKE) install_ql-qlf YOSYS_PATH=${CMAKE_CURRENT_BINARY_DIR}/yosys EXTRA_FLAGS="-DPASS_NAME=synth_ql" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys-plugins - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/yosys + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/yosys/bin/yosys COMMENT "Compile Yosys-plugins with given Makefile" ) add_dependencies(yosys-plugins yosys)