PiPedal 1.2.33 initial commit

src/CMakeLists.txt

@@ -46,22 +46,6 @@ endif()
 
 
 
-# Can't get the pkg_check to work.
-# pkg_check_modules(LIBNL3 "nl-genl-3")
-# if(!LIBNL3_FOUND)
-#   message(ERROR "libnl-genl-3-dev package not installed.")
-# else()
-#   message(STATUS "LIBNL3 libraries: ${LIBNL3_LIBRARIES}")
-#   message(STATUS "LBNL3 includes: ${LIBNL3_INCLUDE_DIRS}")
-# endif()
-
-# nlgenl-3 library.
-execute_process(COMMAND ls /usr/include/libnl3/netlink/netlink.h RESULT_VARIABLE LNL3_MISSING OUTPUT_QUIET ERROR_QUIET)
-if(LNL3_MISSING)
-    message(ERROR " Need to: sudo apt install libnl-3-dev libnl-genl-3-dev ")
-endif()
-set(LIBNL3_INCLUDE_DIRS /usr/include/libnl3)
-set(LIBNL3_LIBRARIES nl-3 nl-genl-3)
 
 
 pkg_check_modules(SYSTEMD "systemd")
@@ -81,8 +65,14 @@ endif()
 
 # Use LV2 headers from the /usr/lib directory.
 #set (LV2DEV_INCLUDE_DIRS /usr/lib)
-set (LV2DEV_INCLUDE_DIRS )
+set (LV2DEV_INCLUDE_DIRS ) # use lvt headers fro /usr/include
 
+
+# Use submodules/websocketpp heders taken from websocketpp/develop branch, because debian-provided 
+# version of websocketpp cannot compile under GCC 12.x.
+
+set (WEBSOCKETPP_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/modules/websocketpp) 
+message(STATUS "WEBSOCKETPP_INCLUDE_DIRS ${WEBSOCKETPP_INCLUDE_DIRS}" )
 pkg_check_modules(JACK "jack")
 if(!JACK_FOUND)
   message(ERROR "jack package not installed.")
@@ -148,8 +138,8 @@ set (PIPEDAL_SOURCES
     inverting_mutex.hpp
     DbDezipper.hpp DbDezipper.cpp
     WebServerLog.hpp
+    WifiChannelSelectors.cpp WifiChannelSelectors.hpp
     
-    util.hpp util.cpp
     PiPedalUI.hpp
     PiPedalUI.cpp
     MapPathFeature.hpp
@@ -165,25 +155,15 @@ set (PIPEDAL_SOURCES
     AutoLilvNode.cpp
     RtInversionGuard.hpp
     CpuUse.hpp CpuUse.cpp 
-    P2pConfigFiles.hpp
     AvahiService.cpp AvahiService.hpp
-    ServiceConfiguration.cpp ServiceConfiguration.hpp
-    WriteTemplateFile.cpp WriteTemplateFile.hpp
-    ConfigUtil.hpp ConfigUtil.cpp
-    ConfigSerializer.h ConfigSerializer.cpp
     StdErrorCapture.hpp StdErrorCapture.cpp
     Ipv6Helpers.cpp Ipv6Helpers.hpp
     PluginPreset.cpp PluginPreset.hpp
     CpuGovernor.cpp CpuGovernor.hpp
     GovernorSettings.cpp GovernorSettings.hpp
-    SysExec.cpp SysExec.hpp
-    WebServer.cpp WebServer.hpp HtmlHelper.cpp HtmlHelper.hpp pch.h Uri.cpp Uri.hpp
-    WifiConfigSettings.hpp WifiConfigSettings.cpp
-    WifiDirectConfigSettings.hpp WifiDirectConfigSettings.cpp
-    ConfigUtil.hpp ConfigUtil.cpp
+    WebServer.cpp WebServer.hpp pch.h Uri.cpp Uri.hpp
 
-    RequestHandler.hpp json.cpp json.hpp 
-    json_variant.hpp json_variant.cpp
+    RequestHandler.hpp 
     Scratch.cpp PluginHost.hpp PluginHost.cpp
     PluginType.hpp PluginType.cpp
     Lv2Log.hpp Lv2Log.cpp
@@ -220,9 +200,6 @@ set (PIPEDAL_SOURCES
     Locale.hpp Locale.cpp
     Lv2EventBufferWriter.hpp Lv2EventBufferWriter.cpp
     IpSubnet.hpp
-    WifiChannels.hpp
-    WifiChannels.cpp
-    RegDb.cpp RegDb.hpp
     PiPedalAlsa.hpp PiPedalAlsa.cpp
     InheritPriorityMutex.hpp InheritPriorityMutex.cpp
     UnixSocket.cpp UnixSocket.hpp
@@ -237,12 +214,16 @@ set (PIPEDAL_SOURCES
 
 
 configure_file(config.hpp.in config.hpp)
-include_directories( ${pipedald_SOURCE_DIR}/. ../build/src) 
+include_directories( 
+    ${pipedald_SOURCE_DIR}/. 
+    ../build/src
+    ) 
 
 set (PIPEDAL_INCLUDES     
     ${LV2DEV_INCLUDE_DIRS}
-    ${JACK_INCLUDE_DIRS} ${LILV_0_INCLUDE_DIRS}  ${LIBNL3_INCLUDE_DIRS} 
+    ${JACK_INCLUDE_DIRS} ${LILV_0_INCLUDE_DIRS}  
     ${VST3_INCLUDES}
+    ${WEBSOCKETPP_INCLUDE_DIRS}    
     .
 )
 
@@ -251,7 +232,6 @@ set(PIPEDAL_LIBS libpipedald
     ${VST3_LIBRARIES}
     ${LILV_0_LIBRARIES} 
      # ${JACK_LIBRARIES} - pending delete for JACK support.
-     ${LIBNL3_LIBRARIES} 
       )
 
 
@@ -263,6 +243,8 @@ add_library(libpipedald STATIC ${PIPEDAL_SOURCES})
 target_include_directories(libpipedald PRIVATE ${PIPEDAL_INCLUDES}
     ) 
 
+target_link_libraries(libpipedald PUBLIC PiPedalCommon)
+
 if(${USE_PCH})
   target_precompile_headers(libpipedald PRIVATE pch.h)
 endif()
@@ -275,7 +257,7 @@ add_executable(pipedald
     )
 target_include_directories(pipedald PRIVATE ${PIPEDAL_INCLUDES})
 
-target_link_libraries(pipedald PRIVATE 
+target_link_libraries(pipedald PRIVATE PiPedalCommon
    
     ${PIPEDAL_LIBS}
     )
@@ -285,12 +267,8 @@ add_executable(pipedaltest testMain.cpp
 
     InvertingMutexTest.cpp
     jsonTest.cpp
-    json_variant.cpp
-    json_variant.hpp
 
     utilTest.cpp
-    util.cpp
-    util.hpp
     
     AlsaDriverTest.cpp
     AvahiServiceTest.cpp
@@ -307,21 +285,15 @@ add_executable(pipedaltest testMain.cpp
     MemDebug.cpp
     MemDebug.hpp
     )
-
+target_link_libraries(pipedaltest PRIVATE PiPedalCommon)
 target_include_directories(pipedaltest PRIVATE ${PIPEDAL_INCLUDES}
 ) 
 
 add_executable(jsonTest
      testMain.cpp
      jsonTest.cpp
-     json.hpp
-     json.cpp
-     json_variant.cpp
-     json_variant.hpp
      MapFeature.cpp
      MapFeature.hpp
-     HtmlHelper.cpp
-     HtmlHelper.hpp
      AtomConverter.hpp
      AtomConverter.cpp
      AtomConverterTest.cpp
@@ -329,6 +301,7 @@ add_executable(jsonTest
      Promise.hpp
      PromiseTest.cpp
 )
+target_link_libraries(jsonTest PRIVATE PiPedalCommon)
 target_include_directories(jsonTest PRIVATE ${PIPEDAL_INCLUDES}
     ) 
 
@@ -575,40 +548,26 @@ add_test(NAME DevTest COMMAND pipedaltest "[Dev]")
 
 add_executable(pipedalconfig 
     PrettyPrinter.hpp
-    ServiceConfiguration.cpp ServiceConfiguration.hpp
-    json.cpp json.hpp 
-    HtmlHelper.cpp HtmlHelper.hpp
+    SetWifiConfig.cpp SetWifiConfig.hpp
     CommandLineParser.hpp
-    WriteTemplateFile.hpp WriteTemplateFile.cpp
     PiPedalException.hpp 
-    ConfigSerializer.h ConfigSerializer.cpp
     ConfigMain.cpp
-    WifiConfigSettings.cpp WifiConfigSettings.hpp 
-    WifiDirectConfigSettings.cpp WifiDirectConfigSettings.hpp 
-    ConfigUtil.hpp ConfigUtil.cpp
     JackServerSettings.hpp JackServerSettings.cpp
-    SetWifiConfig.hpp SetWifiConfig.cpp
     SystemConfigFile.hpp SystemConfigFile.cpp
-    WriteTemplateFile.hpp WriteTemplateFile.cpp
-    SysExec.hpp SysExec.cpp
+    WifiChannelSelectors.cpp WifiChannelSelectors.hpp
     asan_options.cpp
     Lv2Log.cpp Lv2Log.hpp
-    P2pConfigFiles.hpp
 
     )
 
-target_link_libraries(pipedalconfig PRIVATE pthread atomic uuid stdc++fs
+target_link_libraries(pipedalconfig PRIVATE PiPedalCommon pthread atomic uuid stdc++fs
     )
 
 add_executable(pipedal_latency_test
-    util.hpp
-    util.cpp
     PrettyPrinter.hpp
     CommandLineParser.hpp
     PiLatencyMain.cpp
     PiPedalAlsa.hpp PiPedalAlsa.cpp
-    json.hpp json.cpp
-    HtmlHelper.cpp HtmlHelper.hpp
     asan_options.cpp
     Lv2Log.cpp Lv2Log.hpp
     AlsaDriver.cpp AlsaDriver.hpp
@@ -616,11 +575,9 @@ add_executable(pipedal_latency_test
     JackServerSettings.hpp JackServerSettings.cpp
     CpuUse.hpp
     CpuUse.cpp
-
-    
     )
 
-target_link_libraries(pipedal_latency_test PRIVATE pthread  asound 
+target_link_libraries(pipedal_latency_test PRIVATE pthread  asound PiPedalCommon
     )
  
 
@@ -639,34 +596,25 @@ target_link_libraries(capturepresets ${PIPEDAL_LIBS})
 
 add_executable(pipedaladmind AdminMain.cpp CommandLineParser.hpp
     UnixSocket.cpp UnixSocket.hpp
-    ServiceConfiguration.cpp ServiceConfiguration.hpp
-    ConfigSerializer.h ConfigSerializer.cpp
-    autoptr_vector.h
+
+    SetWifiConfig.cpp SetWifiConfig.hpp
 
     JackServerSettings.hpp JackServerSettings.cpp
-    json.hpp json.cpp HtmlHelper.hpp HtmlHelper.cpp Lv2Log.hpp Lv2Log.cpp
     Lv2SystemdLogger.hpp Lv2SystemdLogger.cpp
-    WifiConfigSettings.cpp WifiConfigSettings.hpp 
-    WriteTemplateFile.cpp WriteTemplateFile.hpp
-    WifiDirectConfigSettings.cpp WifiDirectConfigSettings.hpp 
-    ConfigUtil.hpp ConfigUtil.cpp
 
-    SetWifiConfig.hpp SetWifiConfig.cpp
+    Lv2Log.cpp Lv2Log.hpp
     SystemConfigFile.hpp SystemConfigFile.cpp    
-    SysExec.hpp SysExec.cpp
     CpuGovernor.cpp CpuGovernor.hpp
     asan_options.cpp
-    P2pConfigFiles.hpp
 
     )
-target_link_libraries(pipedaladmind PRIVATE pthread atomic stdc++fs systemd)
+target_link_libraries(pipedaladmind PRIVATE PiPedalCommon pthread atomic stdc++fs systemd )
 
 add_executable(processcopyrights copyrightMain.cpp
     CommandLineParser.hpp 
     PiPedalException.hpp 
-    HtmlHelper.hpp HtmlHelper.cpp
     asan_options.cpp    )
-target_link_libraries(processcopyrights PRIVATE stdc++fs)
+target_link_libraries(processcopyrights PRIVATE PiPedalCommon stdc++fs)
 
 set (REACT_BUILD_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../build/react/build/)
 set (REACT_NOTICES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../build/src/notices.txt)
@@ -690,7 +638,7 @@ add_custom_command(OUTPUT ${REACT_NOTICES_FILE}
     COMMAND "$<TARGET_FILE:processcopyrights>"
         --output ${REACT_NOTICES_FILE} 
         --projectCopyright ${DEBIAN_COPYRIGHT_FILE} 
-        liblilv-0-0 ${BOOST_COPYRIGHT_DIR} libnl-3-dev libnl-3-dev  lv2-dev
+        liblilv-0-0 ${BOOST_COPYRIGHT_DIR} lv2-dev libsdbus-c++-dev librsvg2-2 libpango-1.0-0 libx11-6 libxrandr2
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${DEBIAN_COPYRIGHT_FILE} "$<TARGET_FILE:processcopyrights>"
     COMMENT "Updating copyright notices."
@@ -702,7 +650,10 @@ add_custom_target (
 )
 
 
-install (TARGETS pipedalconfig pipedald pipedaladmind pipedal_latency_test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+install (TARGETS pipedalconfig pipedal_latency_test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
    EXPORT pipedalTargets)
 
+   install (TARGETS pipedald pipedaladmind DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin
+   EXPORT pipedalSbinTargets)
+