-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sim: bump ubuntu, ns-3 and Go versions (#128)
* chore: Bump various dependency versions * docker images to ubuntu:24.04 * ns-3 to 3.4.1 * go to 1.22.3 * No need for curl * Use go from apt. Remove unneeded steps. * ns-3.42 * SHA * Fixes * DOn't touch endpoint
- Loading branch information
1 parent
25736a0
commit cba6bba
Showing
2 changed files
with
33 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,26 @@ | ||
--- /Users/lars/Downloads/CMakeLists.txt 2023-12-21 15:49:55 | ||
+++ CMakeLists.txt 2023-12-21 16:00:19 | ||
@@ -105,7 +105,7 @@ | ||
else() | ||
# Otherwise we pick all the files in the subdirectory | ||
# and create a scratch for them automatically | ||
- file(GLOB scratch_sources CONFIGURE_DEPENDS ${subdir}/[^.]*.cc) | ||
+ file(GLOB scratch_sources CONFIGURE_DEPENDS ${subdir}/[^.]*.cc helper/[^.]*.cc) | ||
create_scratch("${scratch_sources}") | ||
diff --git a/scratch/CMakeLists.txt b/scratch/CMakeLists.txt | ||
index adeeb2cf8..6e23f81b6 100644 | ||
--- a/scratch/CMakeLists.txt | ||
+++ b/scratch/CMakeLists.txt | ||
@@ -58,6 +58,11 @@ function(create_scratch source_files) | ||
set(target_prefix scratch${scratch_dirname}_) | ||
endif() | ||
|
||
+ # Link our scratches against the helper files | ||
+ get_filename_component(scratch_dirname ${scratch_src} DIRECTORY) | ||
+ file(GLOB helper_files CONFIGURE_DEPENDS ${scratch_dirname}/../helper/*) | ||
+ list(APPEND source_files ${helper_files}) | ||
+ | ||
# Get source absolute path and transform into relative path | ||
get_filename_component(scratch_src ${scratch_src} ABSOLUTE) | ||
get_filename_component(scratch_absolute_directory ${scratch_src} DIRECTORY) | ||
@@ -88,7 +93,8 @@ file( | ||
) | ||
# Filter out files | ||
foreach(entry ${scratch_subdirectories}) | ||
- if(NOT (IS_DIRECTORY ${entry})) | ||
+ # Don't treat our helper directory as a scratch | ||
+ if(NOT (IS_DIRECTORY ${entry}) OR ${entry} MATCHES ".*/helper") | ||
list(REMOVE_ITEM scratch_subdirectories ${entry}) | ||
endif() | ||
endforeach() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters