ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-10-07 09:27:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #258 from jlindgren90/master

Browse Source 
Fix compile error when :unity_helper_path is relative.
This commit is contained in:
Mark VanderVoord
2019-11-11 08:38:14 -05:00
committed by GitHub
parent 18b2deca85 2817da62db
commit d403eb88c8
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_config.rb
+10 -1
View File
@@ -65,7 +65,16 @@ class CMockConfig
end end
options[:unity_helper_path] ||= options[:unity_helper] options[:unity_helper_path] ||= options[:unity_helper]
options[:unity_helper_path] = [options[:unity_helper_path]] if options[:unity_helper_path].is_a? String options[:unity_helper_path] = [options[:unity_helper_path]] if options[:unity_helper_path].is_a? String
options[:includes_c_post_header] = ((options[:includes_c_post_header] || []) + (options[:unity_helper_path] || [])).uniq
if options[:unity_helper_path]
require 'pathname'
includes1 = options[:includes_c_post_header] || []
includes2 = options[:unity_helper_path].map do |path|
Pathname(path).relative_path_from(Pathname(options[:mock_path])).to_s
end
options[:includes_c_post_header] = (includes1 + includes2).uniq
end
options[:plugins].compact! options[:plugins].compact!
options[:plugins].map! {|p| p.to_sym} options[:plugins].map! {|p| p.to_sym}
@options = options @options = options