From: Vsevolod Stakhov Date: Wed, 20 Jan 2021 12:54:45 +0000 (+0000) Subject: [Minor] Improve ragel support in cmake X-Git-Tag: 3.0~746 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19ec44180cef856f21d39db54364d162c972dc05;p=thirdparty%2Frspamd.git [Minor] Improve ragel support in cmake --- diff --git a/cmake/FindRagel.cmake b/cmake/FindRagel.cmake index f17766ac6d..d02a00bea7 100644 --- a/cmake/FindRagel.cmake +++ b/cmake/FindRagel.cmake @@ -73,7 +73,7 @@ ${RAGEL_version_error}") CMAKE_PARSE_ARGUMENTS(RAGEL "" "OUTPUT" "INPUTS;DEPENDS;COMPILE_FLAGS" ${ARGN}) - file(RELATIVE_PATH RAGEL_OUTPUT_RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + file(RELATIVE_PATH RAGEL_OUTPUT_RELATIVE "${CMAKE_CURRENT_BINARY_DIR}" "${RAGEL_OUTPUT}") file(RELATIVE_PATH RAGEL_INPUTS_RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${RAGEL_INPUTS}") @@ -84,8 +84,11 @@ ${RAGEL_version_error}") -o${RAGEL_OUTPUT_RELATIVE} ${RAGEL_INPUTS_RELATIVE} DEPENDS ${RAGEL_INPUTS} ${RAGEL_DEPENDS} COMMENT - "[RAGEL][${Name}] Compiling state machine with Ragel ${RAGEL_VERSION}" + "[RAGEL][${Name}] Compiling state machine with Ragel ${RAGEL_VERSION} -> ${RAGEL_OUTPUT}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + get_filename_component(src_target ${RAGEL_INPUTS} NAME_WE) + add_custom_target(ragel_${src_target} DEPENDS ${RAGEL_OUTPUT}) + set_source_files_properties(${RAGEL_OUTPUT} PROPERTIES GENERATED TRUE) set(RAGEL_${Name}_DEFINED TRUE) set(RAGEL_${Name}_OUTPUTS ${RAGEL_OUTPUT})