From 764bcb90aa014f10e91f79d608c00bd5fc6139f6 Mon Sep 17 00:00:00 2001 From: tomeichlersmith Date: Mon, 9 Oct 2023 12:51:43 -0500 Subject: [PATCH 1/2] make sure includes are only for the build interface --- BuildMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildMacros.cmake b/BuildMacros.cmake index 10739aa..d47967d 100644 --- a/BuildMacros.cmake +++ b/BuildMacros.cmake @@ -263,7 +263,7 @@ function(register_event_object) if(NOT ${PROJECT_SOURCE_DIR}/include IN_LIST include_paths) set(include_paths - ${PROJECT_SOURCE_DIR}/include ${include_paths} + "$" ${include_paths} CACHE INTERNAL "include_paths") endif() From b46f99d14eed6a166202020b76ef3d7326fd46f9 Mon Sep 17 00:00:00 2001 From: tomeichlersmith Date: Mon, 9 Oct 2023 12:51:49 -0500 Subject: [PATCH 2/2] remove now unnecessary macros --- BuildMacros.cmake | 51 ----------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/BuildMacros.cmake b/BuildMacros.cmake index d47967d..9732f6d 100644 --- a/BuildMacros.cmake +++ b/BuildMacros.cmake @@ -286,57 +286,6 @@ function(register_event_object) endfunction() -macro(build_event_bus) - - set(oneValueArgs path) - cmake_parse_arguments(build_event_bus "${options}" "${oneValueArgs}" - "${multiValueArgs}" ${ARGN}) - - if(build_event_bus_path AND NOT EXISTS ${build_event_bus_path}) - foreach(header ${event_headers}) - file(APPEND ${build_event_bus_path} "#include \"${header}\"\n") - endforeach() - endif() - -endmacro() - -macro(build_dict) - - set(oneValueArgs name template) - cmake_parse_arguments(build_dict "${options}" "${oneValueArgs}" - "${multiValueArgs}" ${ARGN}) - - get_filename_component(header_dir ${PROJECT_SOURCE_DIR} NAME) - if(NOT EXISTS - ${PROJECT_SOURCE_DIR}/include/${header_dir}/${build_dict_name}LinkDef.h) - - message(STATUS "Building ROOT dictionary.") - if(DEFINED build_dict_template) - configure_file( - ${build_dict_template} - ${PROJECT_SOURCE_DIR}/include/${header_dir}/${build_dict_name}LinkDef.h - COPYONLY) - endif() - - set(file_path - ${PROJECT_SOURCE_DIR}/include/${header_dir}/${build_dict_name}LinkDef.h) - set(prefix "#pragma link C++") - - list(REMOVE_DUPLICATES namespaces) - foreach(namespace ${namespaces}) - file(APPEND ${file_path} "${prefix} namespace ${namespace};\n") - endforeach() - - foreach(entry ${dict}) - file(APPEND ${file_path} "${prefix} class ${entry}+;\n") - endforeach() - - file(APPEND ${file_path} "\n#endif") - - endif() - -endmacro() - macro(setup_test) set(multiValueArgs dependencies)