Fix invocation of antlr_target.

Add include/v3x path to target_include_directories.
Add debug info to `generate_antlr_parser.py`.

Author: rturrado

scripts/generate_antlr_parser.py

@@ -71,8 +71,10 @@ def generate_antlr_parser(input_folder, output_source_folder, output_include_fol
             exit(5)
         # Move header files to output include folder
         output_files = os.listdir(output_source_folder)
+        print(f"Moving output include files to {output_include_folder}")
         for output_file in output_files:
             if output_file.endswith(".h"):
+                print(f"\t{output_file}")
                 shutil.move(os.path.join(output_source_folder, output_file), output_include_folder)
     except FileNotFoundError as err:
         print("Error running java: {}".format(err.strerror))

src/CMakeLists.txt

@@ -109,10 +109,10 @@ set(CQASM_COMMON_SOURCES
 add_subdirectory(v3x)
 
 # Generate the lexer and the parser.
-function(antlr_target SCRIPT INPUT_DIR OUTPUT_DIR ANTLR_OUTPUTS)
+function(antlr_target SCRIPT INPUT_DIR OUTPUT_SRC_DIR OUTPUT_INC_DIR ANTLR_OUTPUTS)
     add_custom_command(
         OUTPUT ${ANTLR_OUTPUTS}
-        COMMAND ${Python3_EXECUTABLE} ${SCRIPT} ${INPUT_DIR} ${OUTPUT_DIR}
+        COMMAND ${Python3_EXECUTABLE} ${SCRIPT} ${INPUT_DIR} ${OUTPUT_SRC_DIR} ${OUTPUT_INC_DIR}
     )
 endfunction()
 
@@ -220,6 +220,7 @@ target_include_directories(cqasm-lib-obj
     PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/"
     PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include/"
     PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../include/"
+    PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../include/v3x"
     PRIVATE "${antlr4-runtime_INCLUDE_DIRS}/"
     PRIVATE "${fmt_INCLUDE_DIRS}/"
     PRIVATE "${tree-gen_INCLUDE_DIRS}/"