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

Stringify CMake command-line arguments before they are added as compile definitions #494

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+12 −4
Open

Stringify CMake command-line arguments before they are added as compile definitions #494

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ac135a
Add utility macro to stringify a macro
erlingrj Nov 6, 2024
339dc57
Use LF_STRINGIFY in pythontarget.c
erlingrj Nov 6, 2024
75d46b6
More stringify
erlingrj Nov 6, 2024
a2397a8
Update lf-ref
erlingrj Nov 6, 2024
e0724b7
remove LF_STRINGIFY stuff
erlingrj Nov 6, 2024
e4c5049
Merge remote-tracking branch 'origin/main' into cmake-init-include
erlingrj Jan 22, 2025
cb0d9b0
Add docstring
erlingrj Jan 23, 2025
108f087
Merge branch 'main' into cmake-init-include
erlingrj Jan 23, 2025
17d38d0
update
erlingrj Jan 24, 2025
53e1eb0
Merge branch 'main' into cmake-init-include
erlingrj Jan 28, 2025
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
13 changes: 10 additions & 3 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ macro(define X)
endif(DEFINED ${X})
endmacro()

macro(defineString X)
erlingrj marked this conversation as resolved.
Show resolved Hide resolved
if(DEFINED ${X})
message(STATUS ${X}=\"${${X}}\")
target_compile_definitions(reactor-c PUBLIC ${X}=\"${${X}}\")
endif(DEFINED ${X})
endmacro()

# Search and apply all possible compile definitions
message(STATUS "Applying preprocessor definitions...")
define(_LF_CLOCK_SYNC_ATTENUATION)
Expand All @@ -178,9 +185,9 @@ define(NUMBER_OF_WORKERS)
define(NUMBER_OF_WATCHDOGS)
define(USER_THREADS)
define(SCHEDULER)
define(LF_SOURCE_DIRECTORY)
define(LF_SOURCE_GEN_DIRECTORY)
define(LF_PACKAGE_DIRECTORY)
define(LF_FILE_SEPARATOR)
define(WORKERS_NEEDED_FOR_FEDERATE)
define(LF_ENCLAVES)
defineString(LF_SOURCE_DIRECTORY)
defineString(LF_SOURCE_GEN_DIRECTORY)
defineString(LF_PACKAGE_DIRECTORY)
2 changes: 1 addition & 1 deletion lingua-franca-ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master
cmake-init-include
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reset to master when merging.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

Loading