Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce duplication in single source file #409

Merged
merged 1 commit into from
Mar 12, 2024
Merged

reduce duplication in single source file #409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions tools/cmake/build_single_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function(include_file source_filename include_filenames already_included)
function(include_file source_filename include_filenames already_included new_already_included)
foreach(include_filename ${include_filenames})
file(APPEND "${source_filename}" "\n/* ${include_filename} */\n\n")
file(STRINGS "${include_filename}" raw_include_contents NEWLINE_CONSUME ENCODING UTF-8)
Expand Down Expand Up @@ -29,13 +29,16 @@ function(include_file source_filename include_filenames already_included)
else()
set(extracted_full_path "${PROJECT_SOURCE_DIR}/include/${CMAKE_MATCH_1}")
endif()
list(FIND ${already_included} "${extracted_full_path}" FOUND_INDEX)
list(FIND already_included "${extracted_full_path}" FOUND_INDEX)
if((${FOUND_INDEX} EQUAL -1 AND EXISTS "${extracted_full_path}") OR ("${include_filename}" MATCHES "private/config/wrapper/thread_safety.h$"))
list(APPEND ${already_included} "${extracted_full_path}")
list(APPEND already_included "${extracted_full_path}")
include_file(
"${source_filename}"
"${extracted_full_path}"
${already_included}
"${already_included}"
# we can't depend on new inclusions in sub files, since these may
# occur in ifdef blocks that won't be active
ignored
)
endif()
else()
Expand All @@ -53,6 +56,7 @@ function(include_file source_filename include_filenames already_included)
endif()
endforeach()
endforeach()
set(${new_already_included} "${already_included}" PARENT_SCOPE)
endfunction()

message("creating single file library ${SINGLE_SOURCE_FILE}")
Expand All @@ -64,6 +68,7 @@ foreach(source_file ${SOURCE_FILES})
include_file(
"${SINGLE_SOURCE_FILE}"
"${source_file}"
"${include_list}"
include_list
)
endif()
Expand All @@ -75,5 +80,8 @@ set(include_list "")
include_file(
"${SINGLE_HEADER_FILE}"
"${PROJECT_SOURCE_DIR}/include/stumpless.h"
include_list
"${include_list}"
# since this header is done in a single pass there is no need to keep track
# of which headers have been included
ignored
)
Loading