Merge pull request #1 from Yaraslaut/fix/project_naming

Fixes name of the project to use as dependency with conan

Author: Tsche

CMakeLists.txt

@@ -3,22 +3,22 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD 26)
 
-project(rsl_xml CXX)
+project(rsl-xml CXX)
 
-add_library(rsl_xml)
-target_include_directories(rsl_xml PUBLIC include)
+add_library(rsl-xml)
+target_include_directories(rsl-xml PUBLIC include)
 add_subdirectory(src)
 
-target_compile_options(rsl_xml PUBLIC "-freflection-latest")
-target_include_directories(rsl_xml PUBLIC 
+target_compile_options(rsl-xml PUBLIC "-freflection-latest")
+target_include_directories(rsl-xml PUBLIC
     $<INSTALL_INTERFACE:include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>)
 
 find_package(rsl-util REQUIRED)
-target_link_libraries(rsl_xml PUBLIC rsl::util)
+target_link_libraries(rsl-xml PUBLIC rsl::util)
 
 
-install(TARGETS rsl_xml)
+install(TARGETS rsl-xml)
 install(DIRECTORY include/ DESTINATION include)
 
 option(BUILD_EXAMPLES "Enable examples" ON)
@@ -33,13 +33,13 @@ if (BUILD_TESTING)
   message(STATUS "Building unit tests")
 
   enable_testing()
-  add_executable(rsl_xml_test)
+  add_executable(rsl-xml-test)
   add_subdirectory(test)
 
   find_package(GTest REQUIRED)
-  target_link_libraries(rsl_xml_test PRIVATE rsl_xml)
-  target_link_libraries(rsl_xml_test PRIVATE GTest::gtest)
+  target_link_libraries(rsl-xml-test PRIVATE rsl-xml)
+  target_link_libraries(rsl-xml-test PRIVATE GTest::gtest)
 
   include(GoogleTest)
-  gtest_discover_tests(rsl_xml_test)
-endif()
+  gtest_discover_tests(rsl-xml-test)
+endif()

conanfile.py

@@ -20,10 +20,9 @@ class rslXmlRecipe(ConanFile):
         "shared": [True, False],
         "fPIC": [True, False],
         "examples": [True, False],
-        "editable": [True, False],
         "tests" : [True, False]
     }
-    default_options = {"shared": False, "fPIC": True, "examples": False, "editable": False, "tests": False}
+    default_options = {"shared": False, "fPIC": True, "examples": False, "tests": False}
 
     # Sources are located in the same place as this recipe, copy them to the recipe
     exports_sources = "CMakeLists.txt", "src/*", "include/*", "test/*"
@@ -57,9 +56,7 @@ def build(self):
                 "BUILD_EXAMPLES": self.options.examples,
             })
         cmake.build()
-        if self.options.editable:
-            # package is in editable mode - make sure it's installed after building
-            cmake.install()
+        cmake.install()
 
     def package(self):
         cmake = CMake(self)
@@ -70,5 +67,5 @@ def package_info(self):
         self.cpp_info.components["xml"].set_property("cmake_target_name", "rsl::xml")
         self.cpp_info.components["xml"].includedirs = ["include"]
         self.cpp_info.components["xml"].libdirs = ["lib"]
-        self.cpp_info.components["xml"].libs = ["rsl_xml"]
-        self.cpp_info.components["xml"].requires = ["rsl-util::util"]
+        self.cpp_info.components["xml"].libs = ["rsl-xml"]
+        self.cpp_info.components["xml"].requires = ["rsl-util::util"]

example/CMakeLists.txt

@@ -1,8 +1,8 @@
-project(rsl_xml)
+project(rsl-xml)
 
 function(DEFINE_EXAMPLE TARGET)
   add_executable(example_${TARGET} "${TARGET}.cpp")
-  target_link_libraries(example_${TARGET} PRIVATE rsl_xml)
+  target_link_libraries(example_${TARGET} PRIVATE rsl-xml)
 endfunction()
 
-DEFINE_EXAMPLE(xml)
+DEFINE_EXAMPLE(xml)

src/CMakeLists.txt

@@ -1 +1 @@
-target_sources(rsl_xml PRIVATE dummy.cpp)
+target_sources(rsl-xml PRIVATE dummy.cpp)

test/CMakeLists.txt

@@ -1,3 +1,3 @@
-target_sources(rsl_serialize_test PRIVATE main.cpp)
+target_sources(rsl-serialize-test PRIVATE main.cpp)
 
-add_subdirectory(xml)
+add_subdirectory(xml)

test/xml/CMakeLists.txt

@@ -1,3 +1,3 @@
-target_sources(rsl_serialize_test PRIVATE 
+target_sources(rsl-serialize-test PRIVATE
   basic.cpp
-)
+)