Skip to content
Extraits de code Groupes Projets
Valider f012c1f6 rédigé par François De Keersmaeker's avatar François De Keersmaeker
Parcourir les fichiers

Fixed include

parent 6d25e167
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -10,6 +10,10 @@ IF( OPENWRT_CROSSCOMPILING )
target_link_libraries({{nfqueue_name}} jansson mnl nfnetlink nftnl nftables netfilter_queue netfilter_log)
ENDIF()
target_link_libraries({{nfqueue_name}} nfqueue packet_utils rule_utils)
target_link_libraries({{nfqueue_name}} header {{custom_parsers}})
{% if domain_names|length > 0 %}
target_link_libraries({{nfqueue_name}} header dns dns_map)
{% endif %}
{% set parsers = custom_parsers - set(["dns"]) if "dns" in custom_parsers else custom_parsers %}
target_link_libraries({{nfqueue_name}} header {{parsers}})
target_include_directories({{nfqueue_name}} PRIVATE ${INCLUDE_DIR} ${INCLUDE_PARSERS_DIR})
install(TARGETS {{nfqueue_name}} DESTINATION ${EXECUTABLE_OUTPUT_PATH})
......@@ -26,12 +26,14 @@
{% if "dns" in parser %}
{% set dns_parser_included.value = True %}
#include "dns.h"
#include "dns_map.h"
{% else %}
#include "{{parser}}.h"
{% endif %}
{% endfor %}
{% if domain_names|length > 0 and not dns_parser_included.value %}
#include "dns.h"
#include "dns_map.h"
{% endif %}
......
......@@ -233,7 +233,8 @@ def write_firewall(
cmake_dict = {
"device": device["name"],
"nfqueue_name": nfqueue_name,
"custom_parsers": custom_parsers
"custom_parsers": custom_parsers,
"domain_names": global_accs["domain_names"]
}
env.get_template("CMakeLists.txt.j2").stream(cmake_dict).dump(os.path.join(output_dir, "CMakeLists.txt"))
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter