Move all CMake of lib-src to cmake-proxies

Previously lib-src that we controlled had their cmake files with them.  This is clearer.
Also added place holders for help and locale.
Also enabled libvorbis and soundtouch and disabled portburn.

CMakeLists.txt

@@ -1,10 +1,13 @@
 #directory audacity top level
-cmake_minimum_required (VERSION 3.8) # so we can use cotire and source_group
+# 3.8 so we can use source_group
+# cotire only needs 2.8.12
+cmake_minimum_required (VERSION 3.8) 
 cmake_policy(SET CMP0043 NEW) # just hide an annoying warning in 3.0.2
 
-# There must be a symbol for this already, surely?
+# Renaming.  Could just use the official name throughout.
 set( top_dir ${CMAKE_SOURCE_DIR} )
 
+# Path for cotire.cmake, and later for our wxwidgets.cmake.
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
 include(cotire)
 
@@ -25,7 +28,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 #set( wxWidgets_CONFIGURATION "mswud" )
 
 
-add_subdirectory( "lib-src" )
+#add_subdirectory( "lib-src" ) #All lib building happens via the proxies.
 add_subdirectory( "cmake-proxies" )
 add_subdirectory( "src" )
 

cmake-proxies/CMakeLists.txt

@@ -2,8 +2,6 @@
 set( LIB_SRC_DIRECTORY ${top_dir}/lib-src/ )
 
 #These are done in their actual directories, no need for a proxy.
-#add_subdirectory( "mod-script-pipe" )
-#add_subdirectory( "FileDialog" )
 
 #Same idea, but not yet done/needed
 #add_subdirectory( "mod-null" )
@@ -16,6 +14,8 @@ set( LIB_SRC_DIRECTORY ${top_dir}/lib-src/ )
 
 
 add_subdirectory( "expat" )
+add_subdirectory( "FileDialog" )
+#add_subdirectory( "help" )
 add_subdirectory( "libflac" )
 add_subdirectory( "libflac++" )
 add_subdirectory( "libid3tag" )
@@ -26,11 +26,15 @@ add_subdirectory( "libscorealign" )
 add_subdirectory( "libsndfile" )
 add_subdirectory( "libsoxr" )
 add_subdirectory( "libvamp" )
+add_subdirectory( "libvorbis" )
+#add_subdirectory( "locale" )
 add_subdirectory( "lv2" )
+add_subdirectory( "mod-script-pipe" )
 add_subdirectory( "portaudio-v19" )
 add_subdirectory( "portmidi" )
 add_subdirectory( "portmixer" )
-add_subdirectory( "portburn" )
+#add_subdirectory( "portburn" ) # not built
 add_subdirectory( "portsmf" )
 add_subdirectory( "sbsms" )
+add_subdirectory( "soundtouch" )
 add_subdirectory( "twolame" )

cmake-proxies/FileDialog/CMakeLists.txt

@@ -1,5 +1,7 @@
 #directory lib-src/FileDialog
-
+set( TARGET FileDialog )
+set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
+project( ${TARGET} )
 
 set( SOURCES 
 ${LIB_SRC_DIRECTORY}FileDialog/FileDialog.cpp
@@ -7,17 +9,16 @@ ${LIB_SRC_DIRECTORY}FileDialog/FileDialog.cpp
 ${LIB_SRC_DIRECTORY}FileDialog/win/FileDialogPrivate.cpp
 )
 
-
-project (FileDialog)
 add_library( FileDialog STATIC ${SOURCES})
 find_package(wxWidgets REQUIRED COMPONENTS net core base)
 include( ${wxWidgets_USE_FILE} )
-target_include_directories( FileDialog PRIVATE
+target_include_directories(  ${TARGET} PRIVATE 
 #${wxWidgets_INCLUDE_DIRS}
-${top_dir}/FileDialog
-${top_dir}/FileDialog/win
+${TARGET_SOURCE}
+${TARGET_SOURCE}/win
 )
 add_definitions( -DWXUSINGDLL -DWIN32 -D_LIB 
 #${wxWidgets_DEFINITIONS} 
 )
-target_link_libraries(FileDialog ${wxWidgets_LIBRARIES})
+target_link_libraries(${TARGET} ${wxWidgets_LIBRARIES})
+

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

@@ -0,0 +1,20 @@
+#directory cmake-proxies/mod-script-pipe
+set( TARGET mod-script-pipe )
+set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
+project( ${TARGET} )
+find_package(wxWidgets REQUIRED COMPONENTS net core base)
+include(${wxWidgets_USE_FILE})
+
+set( SOURCES 
+${TARGET_SOURCE}/PipeServer.cpp
+${TARGET_SOURCE}/ScripterCallback.cpp
+)
+# This defines the #define on both Windows and Linux.
+add_definitions( -DBUILDING_SCRIPT_PIPE )
+add_library( ${TARGET} MODULE ${SOURCES})
+
+target_include_directories( ${TARGET} PRIVATE 
+  ${top_dir}/win
+)
+
+target_link_libraries( ${TARGET}  ${wxWidgets_LIBRARIES})

lib-src/mod-script-pipe/CMakeLists.txt

@@ -1,10 +0,0 @@
-#directory lib-src/mod-script-pipe
-project (mod-script-pipe)
-find_package(wxWidgets REQUIRED COMPONENTS net core base)
-include(${wxWidgets_USE_FILE})
-include_directories(${install_dir}../../win)
-
-# This defines the #define on both Windows and Linux.
-add_definitions( -DBUILDING_SCRIPT_PIPE )
-add_library( mod-script-pipe MODULE PipeServer.cpp ScripterCallback.cpp)
-target_link_libraries(mod-script-pipe ${wxWidgets_LIBRARIES})