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.

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

hotfix: restored missing NOISE_IN_SUBDIR #include-conditional code #1063

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

tcoyvwac
Copy link
Contributor

@tcoyvwac tcoyvwac commented Jul 10, 2023

System: Debian Sid

Problem:
Cannot compile project.
On some systems, noise.h is not located & defined inside a "noise/" subdirectory.

For example, on Debian Sid, it is located inside the "libnoise/" subdirectory.

Fix:
This PR restores missing conditional NOISE_IN_SUBDIR #include-code and fixed regression detected onwards from commit: d1e96913.

Compiling fails if NOISE_IN_SUBDIR include-route is not defined.
Restored conditional-include-code and fixed regression detected onwards
from commit: d1e9691.
@tcoyvwac
Copy link
Contributor Author

tcoyvwac commented Jul 16, 2023

Current Situation:

  • Adding / Providing NOISE_IN_SUBDIR #include condition code in PR fails.

Expected:

  • By adding NOISE_IN_SUBDIR as a conditional code for #include files, the CI-buildchain will pick the correct #include files and compile.

Actual:

  • Adding NOISE_IN_SUBDIR as a conditional code for #include files is ignored, the CI Buildchain cannot complete because NOISE_IN_SUBDIR has not been correctly defined / added to its (Conan) build process.

Notes:
Looking at the commit history, added to commit: 0e9a4b8, there is a file called "cmake/dependencies-helpers/LibNoise.cmake" which adds NOISE_IN_SUBDIR to the buildchain process for Conan. It is activated by the macro resolve_conan_dependencies here on lines 275-278.

However, looking further, it seems that during a buildchain-refactoring commit: 54385f0 it was moved and renamed... but not included into any parent .cmake file (so not used or called), in this case, I believe it is now a file called "DependenciesConfig.cmake"

This means the current Conan CI process is not correctly adding NOISE_IN_SUBDIR as a compile-value definition in its build-process (as it was doing so previously).


Steps forward:
To provide a way to add back the previous NOISE_IN_SUBDIR compile-value definition to the Conan CI build-process which would fix the PR failing the (current) automated CI-build checks.

@lizzyd710
Copy link
Collaborator

Thanks for handling this while I have been a terrible dev and basically taken an impromptu hiatus while Life happened...feel free to ping me when you figure out this issue and the tests pass.

@lizzyd710 lizzyd710 added the build Build related label Jul 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Build related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants