cmake: update handling of public namespace headers
This commit is contained in:
@@ -18,10 +18,12 @@ function(add_fx_assembly)
|
|||||||
|
|
||||||
set(assembly_include_paths "")
|
set(assembly_include_paths "")
|
||||||
set(assembly_sources ${CMAKE_CURRENT_SOURCE_DIR}/assembly.c)
|
set(assembly_sources ${CMAKE_CURRENT_SOURCE_DIR}/assembly.c)
|
||||||
|
set(assembly_headers)
|
||||||
|
|
||||||
foreach (dir ${arg_NAMESPACES})
|
foreach (dir ${arg_NAMESPACES})
|
||||||
add_subdirectory(${fx_source_root}/${dir} ${fx_build_root}/namespaces/${dir})
|
add_subdirectory(${fx_source_root}/${dir} ${fx_build_root}/namespaces/${dir})
|
||||||
set(assembly_sources ${assembly_sources} ${namespace_sources})
|
set(assembly_sources ${assembly_sources} ${namespace_sources})
|
||||||
|
set(assembly_headers ${assembly_headers} ${namespace_headers})
|
||||||
set(assembly_include_paths ${assembly_include_paths} ${namespace_include_paths})
|
set(assembly_include_paths ${assembly_include_paths} ${namespace_include_paths})
|
||||||
endforeach (dir)
|
endforeach (dir)
|
||||||
|
|
||||||
@@ -86,6 +88,7 @@ macro(export_fx_namespace_details ns_name)
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/sys/${fx_system_name}/${fx_system_arch}/*.h
|
${CMAKE_CURRENT_SOURCE_DIR}/sys/${fx_system_name}/${fx_system_arch}/*.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/sys/${fx_system_name}/${fx_system_arch}/*.S)
|
${CMAKE_CURRENT_SOURCE_DIR}/sys/${fx_system_name}/${fx_system_arch}/*.S)
|
||||||
file(GLOB headers include/${namespace_path}/*.h)
|
file(GLOB headers include/${namespace_path}/*.h)
|
||||||
|
set(namespace_headers ${headers} PARENT_SCOPE)
|
||||||
set(namespace_sources
|
set(namespace_sources
|
||||||
${namespace_sources}
|
${namespace_sources}
|
||||||
${base_namespace_sources}
|
${base_namespace_sources}
|
||||||
@@ -100,5 +103,6 @@ macro(export_fx_namespace_details ns_name)
|
|||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
set(internal_libs ${internal_libs} PARENT_SCOPE)
|
set(internal_libs ${internal_libs} PARENT_SCOPE)
|
||||||
set(internal_defines ${internal_defines} PARENT_SCOPE)
|
set(internal_defines ${internal_defines} PARENT_SCOPE)
|
||||||
|
install(FILES ${headers} DESTINATION include/${namespace_path})
|
||||||
endmacro(export_fx_namespace_details)
|
endmacro(export_fx_namespace_details)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user