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

Add necessary define to ace/config.h when compiling with OpenDDS #163

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Add necessary define to ace/config.h when compiling with OpenDDS #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5e8cb6
Add necessary define to ace/config.h when compiling with OpenDDS
jwillemsen Mar 5, 2024
d8f690b
Merge branch 'master' into jwi-openddsconfigfile
jwillemsen Mar 5, 2024
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
3 changes: 3 additions & 0 deletions brix11/lib/brix11/brix/common/cmds/configure/ace_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ def self.create_config(cfg)
begin
config_h_io = cfg.dryrun? ? STDOUT : File.new(config_h, 'w')
config_h_io.puts("//----- #{CONFIG_H} -----") if cfg.dryrun?
if cfg.features.has_key?(:opendds) && cfg.features[:opendds].state
config_h_io << "#define OPENDDS_IGNORE_OPENDDSCONFIG_H_FILE\n"
end
config_h_io << (cfg.options[:platform][:config_prelude] || '')
config_h_io.puts(%Q{#include "ace/#{config_include(cfg.options)}"})
config_h_io << (cfg.options[:platform][:config_post] || '')
Expand Down
3 changes: 3 additions & 0 deletions brix11/lib/brix11/brix/common/cmds/configure/hostsetup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ def create_build_config(x11_host_root, cfg)
begin
config_h_io = cfg.dryrun? ? STDOUT : File.new(ace_config, 'w')
config_h_io.puts("//----- HOST #{ACE_Config::CONFIG_H} -----") if cfg.dryrun?
if cfg.features.has_key?(:opendds) && cfg.features[:opendds].state
config_h_io << "#define OPENDDS_IGNORE_OPENDDSCONFIG_H_FILE\n"
end
config_h_io << "#define ACE_MONITOR_FRAMEWORK 0\n"
config_h_io.puts('#include "ace/config-linux.h"')
ensure
Expand Down