mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-02 11:54:27 +02:00
units package renamed to mp-units/mp::units
This commit is contained in:
@@ -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"
|
||||
|
@@ -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 . <username>/<channel> --build=outdated <your_profile_and_setting
|
||||
# Upload package to conan server
|
||||
|
||||
```bash
|
||||
$ conan upload -r <remote-name> --all units/0.0.1@<user>/<channel>
|
||||
$ conan upload -r <remote-name> --all mp-units/0.0.1@<user>/<channel>
|
||||
```
|
||||
|
@@ -24,5 +24,5 @@
|
||||
add_executable(example example.cpp)
|
||||
target_link_libraries(example
|
||||
PRIVATE
|
||||
units::units
|
||||
mp::units
|
||||
)
|
||||
|
@@ -62,7 +62,7 @@ target_include_directories(units
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
)
|
||||
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)
|
||||
|
@@ -30,5 +30,5 @@ add_library(unit_tests
|
||||
)
|
||||
target_link_libraries(unit_tests
|
||||
PRIVATE
|
||||
units::units
|
||||
mp::units
|
||||
)
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user