Skip to content

Install public headers; de-duplicate install include dir #1

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

Merged
meshula merged 2 commits into from
Jul 5, 2026
Merged

Install public headers; de-duplicate install include dir #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd396bf
Install public headers; de-duplicate install include dir
Jul 4, 2026
94c9175
Remove 'register' storage-class from bundled RtAudio (illegal in C++17)
Jul 5, 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
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,10 @@ install(TARGETS libnyquist
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
)
# NOTE: the install interface include dir is declared once, via
# $<INSTALL_INTERFACE:include> in target_include_directories() above. Do not also
# pass INCLUDES DESTINATION here or it lands in INTERFACE_INCLUDE_DIRECTORIES twice.

# install the cmake configuration files
install(EXPORT libnyquist
Expand All @@ -248,7 +250,10 @@ install(EXPORT libnyquist

message(STATUS "CMAKE_INSTALL_INCLUDEDIR: ${CMAKE_INSTALL_INCLUDEDIR}")

# todo, install the headers
# install the public headers so an installed libnyquist is usable by consumers
# (matches the $<INSTALL_INTERFACE:include> above: #include <libnyquist/...>)
install(DIRECTORY "${LIBNYQUIST_ROOT}/include/libnyquist"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

# export the targets for use when libnyquist is included as a subproject
export(TARGETS libnyquist
Expand Down
4 changes: 2 additions & 2 deletions third_party/rtaudio/RtAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10119,8 +10119,8 @@ void RtApi :: convertBuffer( char *outBuffer, char *inBuffer, ConvertInfo &info

void RtApi :: byteSwapBuffer( char *buffer, unsigned int samples, RtAudioFormat format )
{
register char val;
register char *ptr;
char val;
char *ptr;

ptr = buffer;
if ( format == RTAUDIO_SINT16 ) {
Expand Down
Loading