Skip to content

Commit 877ea66

Browse files
committed
Fix linux build error on tests
1 parent b3d2f87 commit 877ea66

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

include/core/registry.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct package_setup {
8181

8282
// platform-specific overrides
8383
platform_setup windows;
84-
platform_setup linux;
84+
platform_setup linux_os; // Can't use 'linux' - it's a predefined macro on Linux
8585
platform_setup macos;
8686

8787
bool has_setup() const { return !commands.empty(); }

src/core/commands/command_build.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,11 @@ static bool run_package_setup(
461461
required_tools = pkg.setup.macos.required_tools;
462462
}
463463
#else
464-
if (!pkg.setup.linux.commands.empty()) {
465-
commands = pkg.setup.linux.commands;
464+
if (!pkg.setup.linux_os.commands.empty()) {
465+
commands = pkg.setup.linux_os.commands;
466466
}
467-
if (!pkg.setup.linux.required_tools.empty()) {
468-
required_tools = pkg.setup.linux.required_tools;
467+
if (!pkg.setup.linux_os.required_tools.empty()) {
468+
required_tools = pkg.setup.linux_os.required_tools;
469469
}
470470
#endif
471471

src/core/registry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,8 @@ registry::load_package_file(const std::string &name) const {
522522
info.setup.windows.required_tools = reader.get_string_array("setup.windows.requires");
523523
}
524524
if (reader.has_key("setup.linux")) {
525-
info.setup.linux.commands = reader.get_string_array("setup.linux.commands");
526-
info.setup.linux.required_tools = reader.get_string_array("setup.linux.requires");
525+
info.setup.linux_os.commands = reader.get_string_array("setup.linux.commands");
526+
info.setup.linux_os.required_tools = reader.get_string_array("setup.linux.requires");
527527
}
528528
if (reader.has_key("setup.macos")) {
529529
info.setup.macos.commands = reader.get_string_array("setup.macos.commands");

src/core/workspace/workspace.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,8 +1146,8 @@ void configure_index_dependencies_fetchcontent_phase1(
11461146
}
11471147

11481148
cmakelists << " else()\n"; // LINUX
1149-
auto linux_cmds = pkg_info.setup.linux.commands.empty() ?
1150-
pkg_info.setup.commands : pkg_info.setup.linux.commands;
1149+
auto linux_cmds = pkg_info.setup.linux_os.commands.empty() ?
1150+
pkg_info.setup.commands : pkg_info.setup.linux_os.commands;
11511151
for (const auto &cmd : linux_cmds) {
11521152
std::string cmake_cmd = cmd;
11531153
cforge_size_t pos;

0 commit comments

Comments
 (0)