Fixed errors with building with yosys submodule included and fixed executable errors.

Author: loglav03

CMakeLists.txt

@@ -420,18 +420,7 @@ if(${WITH_PARMYS}) # define cmake params to compile Yosys
     # else()
     #     set(CUSTOM_BUILD_PARALLEL_LEVEL "${CMAKE_BUILD_PARALLEL_LEVEL}")
     # endif()
-    # execute_process(
-    #     COMMAND ${GIT_EXECUTABLE} submodule update --init yosys
-    #     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}#/yosys
-    #     RESULT_VARIABLE _submod_ret
-    #     OUTPUT_QUIET
-    #     ERROR_QUIET
-    # )
-    # if(NOT _submod_ret EQUAL 0)
-    #     message(FATAL_ERROR
-    #     "Failed to `git submodule update --init --recursive` in ${CMAKE_CURRENT_SOURCE_DIR}/yosys")
-    # endif()
-    add_subdirectory(cmake/yosys)
+    #add_subdirectory(yosys)
 endif()
 
 add_subdirectory(libs) #libs/CMakeLists.txt handles adding warnings flags to non-external libraries

cmake/yosys/CMakeLists.txt

@@ -43,8 +43,8 @@ if (${WITH_PARMYS})
 	#project(yosys_wrapper NONE)
 
 	# Create a target out of the library compilation result
-	SET(YOSYS_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys CACHE PATH "")
-	SET(YOSYS_BUILD_DIR ${CMAKE_BINARY_DIR}/yosys CACHE PATH "")
+	SET(YOSYS_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys)
+	SET(YOSYS_BUILD_DIR ${CMAKE_BINARY_DIR}/yosys)
 
 	set(CURRENT_CPPFLAGS "$(CPPFLAGS)-w")
 	if(${CMAKE_GENERATOR} STREQUAL "Ninja")
@@ -69,23 +69,25 @@ if (${WITH_PARMYS})
 	# endif()
 
 	# how to build the result of the library
-	add_custom_command(OUTPUT yosys-bin
+	add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/yosys
 		COMMAND ${MAKE_PROGRAM} -C ${YOSYS_SRC_DIR}
 		    ENABLE_ABC=0
-		    PREFIX=${YOSYS_BUILD_DIR}
-		COMMAND 
+		    PREFIX=${CMAKE_BINARY_DIR}
+		    #> /dev/null
+		#COMMAND 
 	#            -j${CUSTOM_BUILD_PARALLEL_LEVEL}
-		    > /dev/null
+		    #> /dev/null
 
-		 COMMAND ${MAKE_PROGRAM} -C ${YOSYS_SRC_DIR}
-		    install ENABLE_ABC=0
-		    PREFIX=${YOSYS_BUILD_DIR}
-		    > /dev/null
+		 COMMAND ${MAKE_PROGRAM} 
+		    -C ${YOSYS_SRC_DIR}
+		    install
+		    ENABLE_ABC=0
+		    PREFIX=${CMAKE_BINARY_DIR}
+		    #> /dev/null
 
 		WORKING_DIRECTORY ${YOSYS_SRC_DIR})
 
-	add_custom_target(yosys ALL DEPENDS yosys-bin)
-
+	add_custom_target(yosys ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/yosys)
 
     if (${SYNLIG_SYSTEMVERILOG})
 

libs/EXTERNAL/CMakeLists.txt

@@ -19,7 +19,7 @@ add_library(parmys SHARED
 )
 target_include_directories(parmys PUBLIC ${LIB_INCLUDE_DIRS})
 target_include_directories(parmys PUBLIC ${LIB_INCLUDE_DIRS_O})
-target_include_directories(parmys PUBLIC ${VTR_SOURCE_DIR}/yosys/share/include)
+target_include_directories(parmys PUBLIC ${VTR_SOURCE_DIR}/libs/EXTERNAL/yosys/share/include)
 
 add_definitions("-D_YOSYS_")
 add_dependencies(parmys yosys)