Add mod-nyq-bench target

And define a few more convenience variables.

CMakeLists.txt

@@ -213,13 +213,20 @@ macro( def_vars )
 endmacro()
 
 # And define the non-context dependent paths
-set( _EXEDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}" )
+set( _EXEDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
-# These aren't really context dependent, but...
+if( CMAKE_BUILD_TYPE )
+   set( _EXEDIR "${_EXEDIR}/${CMAKE_BUILD_TYPE}" )
+endif()
+
+# On the Mac, make it the content directory
 if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
    set( _EXEDIR "${_EXEDIR}/Audacity.app/Contents" )
 endif()
+
 set( _MODDIR "${_EXEDIR}/modules" )
-set( _RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/audacity" )
+set( _PREFIX "${CMAKE_INSTALL_PREFIX}" )
+set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}/audacity" )
+set( _RPATH "\$ORIGIN/../${_LIBDIR}" )
 
 # Helper to organize sources into folders for the IDEs
 macro( organize_source root prefix sources )
@@ -297,6 +304,7 @@ add_subdirectory( "locale" )
 add_subdirectory( "nyquist" )
 add_subdirectory( "plug-ins" )
 add_subdirectory( "src" )
+add_subdirectory( "cmake-proxies/mod-nyq-bench" )
 add_subdirectory( "cmake-proxies/mod-script-pipe" )
 
 # Uncomment what follows for symbol values.

cmake-proxies/mod-nyq-bench/CMakeLists.txt

@@ -0,0 +1,43 @@
+
+set( TARGET mod-nyq-bench )
+set( TARGET_ROOT "${libsrc}/${TARGET}" )
+
+message( STATUS "========== Configuring ${TARGET} ==========" )
+
+def_vars()
+
+add_library( ${TARGET} MODULE )
+
+list( APPEND SOURCES
+   PRIVATE
+      ${TARGET_ROOT}/NyqBench.cpp
+      ${TARGET_ROOT}/NyqBench.h
+)
+
+list( APPEND INCLUDES
+   PUBLIC
+      ${TARGET_ROOT}
+)
+
+list( APPEND LIBRARIES
+   PRIVATE
+      Audacity
+      libnyquist
+      portaudio-v19
+      wxwidgets
+)
+
+set_target_properties( ${TARGET}
+   PROPERTIES
+      LIBRARY_OUTPUT_DIRECTORY_DEBUG "${_MODDIR}"
+      LIBRARY_OUTPUT_DIRECTORY_RELEASE "${_MODDIR}"
+      LIBRARY_OUTPUT_DIRECTORY "${_MODDIR}"
+      PREFIX ""
+      FOLDER "lib-src"
+)
+
+organize_source( "${TARGET_ROOT}" "" "${SOURCES}" )
+target_sources( ${TARGET} PRIVATE ${SOURCES} )
+target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
+target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )
+

cmake-proxies/mod-script-pipe/CMakeLists.txt

@@ -36,6 +36,7 @@ set_target_properties( ${TARGET}
       LIBRARY_OUTPUT_DIRECTORY_RELEASE "${_MODDIR}"
       LIBRARY_OUTPUT_DIRECTORY "${_MODDIR}"
       PREFIX ""
+      FOLDER "lib-src"
 )
 
 organize_source( "${TARGET_ROOT}" "" "${SOURCES}" )

src/CMakeLists.txt

@@ -1018,8 +1018,9 @@ set( USE_VST ${enable_vst} )
 
 set( AUDACITY_NAME "Audacity" )
 set( BUILDING_AUDACITY 1 )
-set( INSTALL_PREFIX "" )
+set( INSTALL_PREFIX "${_PREFIX}" )
-set( LIBDIR "" )
+set( PKGLIBDIR "${_LIBDIR}" )
+set( LIBDIR "${_LIBDIR}" )
 set( HAVE_GTK ${GTK_FOUND} )
 set( DISABLE_DYNAMIC_LOADING_FFMPEG ${disable_dynamic_loading} )
 

src/audacity_config.h.in

@@ -32,12 +32,15 @@
    declarations. */
 #cmakedefine HAVE_VISIBILITY 1
 
-/* define as prefix where Audacity is installed */
+/* Define as prefix where Audacity is installed */
 #define INSTALL_PREFIX "@INSTALL_PREFIX@"
 
-/* define as prefix where Audacity is installed */
+/* Define where libraries get installed */
 #define LIBDIR "@LIBDIR@"
 
+/* Define where Audacity specific libraries get installed */
+#define PKGLIBDIR "@PKGLIBDIR@"
+
 /* Define if Audio Unit plug-ins are enabled (Mac OS X only) */
 #cmakedefine USE_AUDIO_UNITS 1