diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a7d764..cfa3367 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 +# $ 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 @@ -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 $ above: #include ) +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 diff --git a/third_party/rtaudio/RtAudio.cpp b/third_party/rtaudio/RtAudio.cpp index a0e0012..15d1087 100644 --- a/third_party/rtaudio/RtAudio.cpp +++ b/third_party/rtaudio/RtAudio.cpp @@ -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 ) {