update dependencies, reorganize src/

Author: Tsche

CMakeLists.txt

@@ -25,12 +25,10 @@ add_library(rsltest_main SHARED)
 target_link_libraries(rsltest_main PUBLIC rsltest)
 
 find_package(rsl-config REQUIRED)
-find_package(rsl-serialize REQUIRED)
-find_package(rsl-assert REQUIRED)
+find_package(rsl-xml REQUIRED)
 
-target_link_libraries(rsltest PUBLIC rsl::assert)
 target_link_libraries(rsltest PUBLIC rsl::config)
-target_link_libraries(rsltest PUBLIC rsl::serialize)
+target_link_libraries(rsltest_main PUBLIC rsl::xml)
 
 
 add_subdirectory(src)

conanfile.py

@@ -39,8 +39,7 @@ def configure(self):
     def requirements(self):
         self.requires("libassert/2.1.5", transitive_headers=True, transitive_libs=True)
         self.requires("rsl-config/0.1", transitive_headers=False, transitive_libs=True)
-        self.requires("rsl-serialize/0.1", transitive_headers=False, transitive_libs=True)
-        self.requires("rsl-assert/0.1", transitive_headers=True, transitive_libs=True)
+        self.requires("rsl-xml/0.1", transitive_headers=False, transitive_libs=True)
 
     def layout(self):
         cmake_layout(self)
@@ -78,7 +77,7 @@ def package_info(self):
         self.cpp_info.components["test_main"].set_property("cmake_target_name", "rsl::test_main")
         self.cpp_info.components["test_main"].includedirs = ["include"]
         self.cpp_info.components["test_main"].libdirs = ["lib"]
-        self.cpp_info.components["test_main"].requires = ["test", "rsl-config::config", "rsl-serialize::serialize", "rsl-assert::assert"] # depend on primary component
+        self.cpp_info.components["test_main"].requires = ["test", "rsl-config::config", "rsl-xml::xml"] # depend on primary component
         self.cpp_info.components["test_main"].libs = ["rsltest_main"]
 
 

src/CMakeLists.txt

@@ -3,8 +3,4 @@ target_sources(rsltest PUBLIC
     test.cpp
 )
 
-target_sources(rsltest_main PRIVATE main.cpp)
-target_include_directories(rsltest PRIVATE .)
-target_include_directories(rsltest_main PRIVATE .)
-
-add_subdirectory(reporters)
+add_subdirectory(main)

src/main/CMakeLists.txt

@@ -0,0 +1,4 @@
+target_sources(rsltest_main PRIVATE main.cpp)
+target_include_directories(rsltest_main PRIVATE .)
+
+add_subdirectory(reporters)

src/main.cpp src/main/main.cppsrc/main.cpp renamed to src/main/main.cpp

@@ -1,4 +1,4 @@
-target_sources(rsltest PUBLIC
+target_sources(rsltest_main PUBLIC
   terminal.cpp
   catch2xml.cpp
   xml.cpp