Skip to content

fix(cmake): FindLibNoise: correct include dir, support Debian/Ubuntu header layout #1130

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

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

fix(cmake): FindLibNoise: correct include dir, support Debian/Ubuntu header layout #1130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff94c06
fix(cmake): FindLibNoise returns the parent of noise/ as include dir
Danux-Be Aug 29, 2026
49f9fb7
fix(cmake): FindLibNoise supports the Debian/Ubuntu header layout
Danux-Be Aug 29, 2026
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
24 changes: 22 additions & 2 deletions cmake/find-modules/FindLibNoise.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,30 @@ endif ()

include(FindPackageHandleStandardArgs)

find_path(LibNoise_INCLUDE_DIR noise.h
PATH_SUFFIXES include include/noise include/libnoise
# Cytopia includes libnoise as <noise/noise.h>, so the include directory must
# be the parent of the noise/ folder (e.g. <prefix>/include), not the folder itself.
find_path(LibNoise_INCLUDE_DIR noise/noise.h
PATH_SUFFIXES include
HINTS ${LIBNOISE_DIR} $ENV{LIBNOISE_DIR}
)

# Debian/Ubuntu install the headers in <prefix>/include/libnoise/ instead of
# <prefix>/include/noise/. Provide a compatibility symlink so that
# <noise/noise.h> keeps working with distro packages.
if (NOT LibNoise_INCLUDE_DIR)
find_path(LibNoise_INCLUDE_DIR libnoise/noise.h
PATH_SUFFIXES include
HINTS ${LIBNOISE_DIR} $ENV{LIBNOISE_DIR}
)
if (LibNoise_INCLUDE_DIR)
set(_noise_compat_dir "${CMAKE_BINARY_DIR}/noise-compat")
file(MAKE_DIRECTORY "${_noise_compat_dir}")
if (NOT EXISTS "${_noise_compat_dir}/noise")
file(CREATE_LINK "${LibNoise_INCLUDE_DIR}/libnoise" "${_noise_compat_dir}/noise" SYMBOLIC)
endif ()
set(LibNoise_INCLUDE_DIR "${_noise_compat_dir}")
endif ()
endif ()
find_library(LibNoise_LIBRARY
NAMES noise noiseutils noise-static noiseutils-static
PATH_SUFFIXES lib/x64 lib/x86
Expand Down
Loading