Ubuntu 24.04 x64 Build

Author: rerdavies

src/lv2c/include/lv2c/Lv2cContainerElement.hpp

@@ -21,6 +21,9 @@
 
 #pragma once
 
+
+#pragma GCC diagnostic ignored "-Woverloaded-virtual" // GCC 13 warning.
+
 namespace lv2c {
     class Lv2cContainerElement: public Lv2cElement {
     public:

src/lv2c/include/lv2c/Lv2cTableElement.hpp

@@ -38,7 +38,8 @@ namespace lv2c {
         static ptr Create() { return std::make_shared<self>(); }
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#pragma GCC diagnostic ignored "-Woverloaded-virtual" //GCC 12
+#pragma GCC diagnostic ignored "-Woverloaded-virtual=" // GCC 13
 
         Lv2cElement::ptr&Child(size_t row, size_t column);
 

src/lv2c_ui/Uri.cpp

@@ -20,6 +20,7 @@
 #include "Uri.hpp"
 #include <stdexcept>
 #include "UriHelper.hpp"
+#include <cstdint>
 
 using namespace pipedal;
 

src/lv2c_ui/UriHelper.hpp

@@ -20,6 +20,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 
 namespace pipedal {
 

src/test/BindingTest.cpp

@@ -17,7 +17,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include "lv2c/Lv2cBindingProperty.hpp"
 #include "lv2c/Lv2cElement.hpp"
 #include <iostream>

src/test/CMakeLists.txt

@@ -6,6 +6,20 @@ cmake_minimum_required (VERSION 3.18)
 find_package(Cairo)
 find_package(X11)
 
+# ffs! Breaking changes (a complete incompatible rewrite) between catch2 v3.x and catch2 v2.x, both installed with `apt install catch2`.
+# Unbuntu 24.04 installs catch 3.x; Raspberry Pi OS installs catch 2.x.
+
+if (EXISTS /usr/include/catch2/catch_all.hpp)
+    message(STATUS "Using catch2 v3.x")
+    set(CATCH2_VERSION_ 3)
+elseif (EXISTS /usr/include/catch2/catch.hpp)
+    message(STATUS "Using catch2 v2.x")
+    set(CATCH2_VERSION_ 2)
+else()
+    message(FATAL_ERROR "catch2 test framework is not installed.")
+endif()
+
+
 
 
 add_executable(lv2c_demo  
@@ -55,7 +69,7 @@ target_link_libraries(lv2c_demo
 
 add_executable(CatchTest 
     $<TARGET_OBJECTS:lv2c> $<TARGET_OBJECTS:lv2c_ui>
-
+    CatchTest.hpp
     UriTest.cpp
     MaterialColorTest.cpp
     TestMain.cpp
@@ -68,13 +82,19 @@ add_executable(CatchTest
     ss.hpp
 )
 
+target_compile_definitions(CatchTest PRIVATE CATCH2_VERSION=${CATCH2_VERSION_})
+
 target_include_directories(CatchTest PRIVATE
     ${Lv2c_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/lv2c_ui
     lv2c_ui lv2c 
 )
 
-target_link_libraries(CatchTest lv2c lv2c_ui pthread)
+if (${CATCH2_VERSION_} EQUAL 3)
+   set(CATCH2_MAIN_LIBS Catch2Main.a Catch2.a )
+endif()
+
+target_link_libraries(CatchTest lv2c lv2c_ui pthread  ${CATCH2_MAIN_LIBS})
 
 
 add_test (NAME CatchTest COMMAND CatchTest)

src/test/CapitalizationTest.cpp

@@ -17,7 +17,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include <string>
 #include <sstream>
 #include <locale>

src/test/CatchTest.hpp

@@ -0,0 +1,13 @@
+
+#ifndef CATCH2_VERSION
+#define CATCH2_VERSION 3
+#endif
+
+#if (CATCH2_VERSION == 3)
+#include <catch2/catch_test_macros.hpp>
+#elif CATCH2_VERSION == 2)
+#include <catch2/catch.hpp>
+#else
+#include <catch2/catch_test_macros.hpp>
+#endif
+#

src/test/ColorTest.cpp

@@ -17,7 +17,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include "lv2c/Lv2cTypes.hpp"
 #include <cmath>
 #include <iostream>

src/test/DamageListTest.cpp

@@ -17,7 +17,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 
 #include "lv2c/Lv2cDamageList.hpp"
 #include <stdexcept>

src/test/JsonTest.cpp

@@ -17,7 +17,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include <string>
 #include <sstream>
 #include <locale>

src/test/MaterialColorTest.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include "lv2c/Lv2cTypes.hpp"
 #include <cmath>
 #include <iostream>

src/test/NiceEditStringTest.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include "lv2c/Lv2cNumericEditBoxElement.hpp"
 using namespace lv2c;
 

src/test/TestMain.cpp

@@ -1,2 +1,5 @@
+
+#if (CATCH2_VERSION == 2)
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include <catch2/catch.hpp>
+#include <catch2/catch.hpp>
+#endif

src/test/UriTest.cpp

@@ -17,7 +17,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <catch2/catch.hpp>
+#include "CatchTest.hpp"
 #include "Uri.hpp"
 #include <string>
 

src/test_plugin/CMakeLists.txt

@@ -34,7 +34,7 @@ add_custom_command(
     OUTPUT  SamplePluginInfo.hpp          # Treated as relative to CMAKE_CURRENT_BINARY_DIR
     COMMAND generate_lv2c_plugin_info 
             ${PLUGIN_URI}
-              --ttl ${CMAKE_CURRENT_BINARY_DIR}/manifest.ttl
+              --ttl ${CMAKE_CURRENT_BINARY_DIR}
               --out ${CMAKE_CURRENT_BINARY_DIR}/SamplePluginInfo.hpp 
               --class SamplePluginInfo
     DEPENDS