Skip to content

Fix path to Empirical directory#211

Merged
mercere99 merged 3 commits intodevosoft:masterfrom
mmore500:ProjectTemplate
Feb 11, 2019
Merged

Fix path to Empirical directory#211
mercere99 merged 3 commits intodevosoft:masterfrom
mmore500:ProjectTemplate

Conversation

@mmore500
Copy link
Copy Markdown
Member

@mmore500 mmore500 commented Feb 4, 2019

The Makefile in question is examples/ProjectTemplate/Makefile.

The EMP_DIR path is currently listed as ../../Empirical. If we want users to be able to compile the Hello World example in its current location, the EMP_DIR path should be ../../../Empirical. This is the change my PR makes. If we want the user to be able to compile the Hello World Example when the user copies the examples/ProjectTemplate outside of the Empirical directory (e.g., next to it), then EMP_DIR path should be ../Empirical. Either way, the current EMP_DIR needs to be fixed.

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 4, 2019

Codecov Report

Merging #211 into master will increase coverage by 0.22%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #211      +/-   ##
==========================================
+ Coverage   65.29%   65.52%   +0.22%     
==========================================
  Files          95       95              
  Lines       13223    13223              
==========================================
+ Hits         8634     8664      +30     
+ Misses       4589     4559      -30
Impacted Files Coverage Δ
source/hardware/AvidaGP.h 52.13% <0%> (+5.21%) ⬆️
source/hardware/AvidaCPU_InstLib.h 77.45% <0%> (+18.62%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e66d680...46be46e. Read the comment docs.

@mmore500
Copy link
Copy Markdown
Member Author

mmore500 commented Feb 4, 2019

No code additions were made, so we should override the codecov fail.

Copy link
Copy Markdown
Member

@mercere99 mercere99 left a comment

Choose a reason for hiding this comment

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

Just a simple addition of ../ to the Empirical path in the Makefile so that the ProjectTemplate compiles in place.

@mercere99 mercere99 merged commit 5b777f7 into devosoft:master Feb 11, 2019
@mmore500 mmore500 deleted the ProjectTemplate branch March 8, 2019 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants