diff --git a/CMakeLists.txt b/CMakeLists.txt index 8735aae23713845e9e52f6d274f62441addf75e7..d4ea865e40eaf5110f6276d42c2b1c51d8369eeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.15) -project(electrometerslibrary) +project(electrometers) option(BUILD_SHARED_LIBS "Build using shared libraries" ON) @@ -20,16 +20,16 @@ set(includedirs include ) -add_library(electrometerslibrary ${sources}) -target_include_directories(electrometerslibrary PRIVATE ${includedirs}) -target_link_libraries(electrometerslibrary PRIVATE cpptango::cpptango) +add_library(electrometers ${sources}) +target_include_directories(electrometers PRIVATE ${includedirs}) +target_link_libraries(electrometers PRIVATE cpptango::cpptango) if (MAJOR_VERSION) - set_target_properties(electrometerslibrary PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION}) + set_target_properties(electrometers PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION}) endif() install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include FILES_MATCHING PATTERN "*.h" ) -install(TARGETS electrometerslibrary LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS electrometers LIBRARY DESTINATION ${LIB_INSTALL_DIR}) diff --git a/conanfile.py b/conanfile.py index fc87bdd340483011b42f7e51f8c8a09d076f5c7d..2906936293e0cdeff15fc24d2124762e7933c8ad 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,8 +1,8 @@ from conan import ConanFile from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps -class electrometerslibraryRecipe(ConanFile): - name = "electrometerslibrary" +class electrometersRecipe(ConanFile): + name = "electrometers" version = "2.5.29" package_type = "library" user = "soleil" @@ -58,4 +58,4 @@ class electrometerslibraryRecipe(ConanFile): cmake.install() def package_info(self): - self.cpp_info.libs = ["electrometerslibrary"] + self.cpp_info.libs = ["electrometers"] diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 36c846ce2ffcc5b6e7b173fb4cb7a2ce8d881082..3366820c0f9a82fa576c93269c3823075988b2d9 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.15) project(PackageTest CXX) -find_package(electrometerslibrary CONFIG REQUIRED) +find_package(electrometers CONFIG REQUIRED) find_package(cpptango CONFIG REQUIRED) add_executable(test_package src/test_package.cpp) -target_link_libraries(test_package electrometerslibrary::electrometerslibrary) +target_link_libraries(test_package electrometers::electrometers) target_link_libraries(test_package cpptango::cpptango)