CytopiaTeam / Cytopia

:deciduous_tree::house_with_garden::office::evergreen_tree: A city building simulation game
https://www.cytopia.net
GNU General Public License v3.0
1.94k stars 101 forks source link

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

Open tcoyvwac opened 12 months ago

tcoyvwac commented 12 months ago

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.

tcoyvwac commented 11 months ago

Current Situation:

Expected:

Actual:


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: https://github.com/CytopiaTeam/Cytopia/commit/54385f0837d9c4cd70e9565ad9479e835285f11f 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 commented 11 months ago

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.