diff --git a/conanfile.py b/conanfile.py index 8d820ee4..07e515ba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,7 +23,7 @@ from conans import ConanFile, CMake class UnitsConan(ConanFile): - name = "units" + name = "mp-units" version = "0.0.1" author = "Mateusz Pusz" license = "https://github.com/mpusz/units/blob/master/LICENSE.md" diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 3b1df4e0..beb72808 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -56,7 +56,7 @@ $ conan remote add conan-nonstd https://api.bintray.com/conan/martinmoene/nonstd - add the following dependency to your `conanfile.txt` or `conanfile.py` files ```python -requires = "units/0.0.1@mpusz/testing" +requires = "mp-units/0.0.1@mpusz/testing" ``` - install conan dependencies before configuring cmake @@ -92,5 +92,5 @@ $ conan create . / --build=outdated --all units/0.0.1@/ +$ conan upload -r --all mp-units/0.0.1@/ ``` diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index b458a68f..d155f770 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -24,5 +24,5 @@ add_executable(example example.cpp) target_link_libraries(example PRIVATE - units::units + mp::units ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2cfe56c8..423f7624 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,7 +62,7 @@ target_include_directories(units $ $ ) -add_library(units::units ALIAS units) +add_library(mp::units ALIAS units) # installation info install(TARGETS units EXPORT ${CMAKE_PROJECT_NAME}Targets @@ -77,4 +77,4 @@ install(DIRECTORY include/units ) # generate configuration files and install the package -configure_and_install(../cmake/common/cmake/simple_package-config.cmake.in units SameMajorVersion) +configure_and_install(../cmake/common/cmake/simple_package-config.cmake.in mp SameMajorVersion) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index be55ec63..9637450e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,5 +30,5 @@ add_library(unit_tests ) target_link_libraries(unit_tests PRIVATE - units::units + mp::units ) diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 4711c0f2..ef48c6af 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -33,8 +33,8 @@ find_package(units CONFIG REQUIRED) # test conan-generated target add_executable(${PROJECT_NAME}_conan test_package.cpp) target_compile_features(${PROJECT_NAME}_conan PRIVATE cxx_std_20) # conan is not able to propagate that yet :-( -target_link_libraries(${PROJECT_NAME}_conan PRIVATE CONAN_PKG::units) +target_link_libraries(${PROJECT_NAME}_conan PRIVATE CONAN_PKG::mp-units) # test cmake target add_executable(${PROJECT_NAME}_cmake test_package.cpp) -target_link_libraries(${PROJECT_NAME}_cmake PRIVATE units::units) +target_link_libraries(${PROJECT_NAME}_cmake PRIVATE mp::units)