Changeset a44b408 in OpenModelica

Timestamp:

2020-10-21T14:04:15+02:00 (4 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

b9156e9

Parents:

c6856ffe

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (07/12/20 20:34:30)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:15)

Message:

[cmake] Move the antlr target macros new file.

• They clutter things in the main cmake file.

Location:

OMCompiler/Parser

Files:

• CMakeLists.txt (modified) (2 diffs)
• omc_antlr_target_macros.cmake (added)

OMCompiler/Parser/CMakeLists.txt

@@ -8 +8 @@
 
 
-function(ADD_ANTLR_GRAMMAR_TARGET input_file output_dir)
-
-  get_filename_component(file_name_no_ext ${input_file} NAME_WE)
-  set(output_file_path_no_ext ${output_dir}/${file_name_no_ext}Parser)
-
-  add_custom_command(
-    DEPENDS ${input_file}
-    SOURCE ${input_file}
-    COMMAND ${Java_JAVA_EXECUTABLE}
-    ARGS -cp ${OMAntlr3_ANTLRJAR}
-          org.antlr.Tool -Xconversiontimeout 10000 -report
-          -o ${output_dir}
-          ${input_file}
-    COMMENT "Generating ${output_file_path_no_ext}.c/h for ANTLR file ${input_file}."
-    OUTPUT ${output_file_path_no_ext}.c
-    OUTPUT ${output_file_path_no_ext}.h
-  )
-  set_source_files_properties(${output_file_path_no_ext}.c GENERATED)
-  set_source_files_properties(${output_file_path_no_ext}.h GENERATED)
-  message(STATUS "added antrl target ${output_file_path_no_ext}")
-endfunction(ADD_ANTLR_GRAMMAR_TARGET)
-
-
-macro(ADD_ANTLR_BASE_LEXER_TARGET input_file output_dir src_list)
-
-  get_filename_component(file_name_no_ext ${input_file} NAME_WE)
-  set(output_file_path_no_ext ${output_dir}/${file_name_no_ext})
-  set(output_file_base_path_no_ext ${output_dir}/${file_name_no_ext}_BaseModelica_Lexer)
-
-  add_custom_command(
-    DEPENDS ${input_file} ${CMAKE_CURRENT_SOURCE_DIR}/BaseModelica_Lexer.g
-    SOURCE ${input_file}
-    COMMAND ${Java_JAVA_EXECUTABLE}
-    ARGS -cp ${OMAntlr3_ANTLRJAR}
-          org.antlr.Tool -Xconversiontimeout 10000
-          -o ${output_dir}
-          ${input_file}
-    COMMENT "Generating ${output_file_path_no_ext}.c/h and ${output_file_base_path_no_ext}.c/h for ANTLR file ${input_file}."
-    OUTPUT ${output_file_path_no_ext}.c
-    OUTPUT ${output_file_path_no_ext}.h
-    OUTPUT ${output_file_base_path_no_ext}.c
-    OUTPUT ${output_file_base_path_no_ext}.h
-  )
-  set_source_files_properties(${output_file_path_no_ext}.c GENERATED)
-  set_source_files_properties(${output_file_path_no_ext}.h GENERATED)
-  set_source_files_properties(${output_file_base_path_no_ext}.c GENERATED)
-  set_source_files_properties(${output_file_base_path_no_ext}.h GENERATED)
-
-  set(LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS ${output_file_path_no_ext}.c ${output_file_base_path_no_ext}.c)
-  # message(STATUS ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
-
-  message(STATUS "added antrl target ${output_file_path_no_ext}")
-endmacro(ADD_ANTLR_BASE_LEXER_TARGET)
-
-
 set(OM_PARSE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Parser_omc.c)
 
@@ -69 +14 @@
 file(MAKE_DIRECTORY ${GNERATED_DIRECTORY})
 
-ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica_3_Lexer.g ${GNERATED_DIRECTORY} OM_PARSE_SOURCES)
-set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
+include(omc_antlr_target_macros.cmake)
 
-ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/ParModelica_Lexer.g ${GNERATED_DIRECTORY} ${OM_PARSE_SOURCES})
-set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
+ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica_3_Lexer.g ${GNERATED_DIRECTORY})
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${ANTLR_BASE_LEXER_Modelica_3_Lexer_OUTPUT_SOURCES})
 
-ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/MetaModelica_Lexer.g ${GNERATED_DIRECTORY} ${OM_PARSE_SOURCES})
-set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${LAST_ANTLR_BASE_LEXER_TARGET_OUTPUTS})
+ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/ParModelica_Lexer.g ${GNERATED_DIRECTORY})
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${ANTLR_BASE_LEXER_ParModelica_Lexer_OUTPUT_SOURCES})
+
+ADD_ANTLR_BASE_LEXER_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/MetaModelica_Lexer.g ${GNERATED_DIRECTORY})
+set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${ANTLR_BASE_LEXER_MetaModelica_Lexer_OUTPUT_SOURCES})
 
 ADD_ANTLR_GRAMMAR_TARGET(${CMAKE_CURRENT_SOURCE_DIR}/Modelica.g ${GNERATED_DIRECTORY})
 set(OM_PARSE_SOURCES ${OM_PARSE_SOURCES} ${GNERATED_DIRECTORY}/ModelicaParser.c)
 
-message(STATUS ${OM_PARSE_SOURCES})
+# message(STATUS ${OM_PARSE_SOURCES})
 
 
 ######################### add libomparser ###########################
-add_library(omparse STATIC ${OM_PARSE_SOURCES})
+add_library(omparse SHARED ${OM_PARSE_SOURCES})
 target_link_libraries(omparse PUBLIC omantlr3)
 target_link_libraries(omparse PUBLIC OpenModelicaRuntimeC)