From 7d204a117754824186e6160e551d7da9aed8375f Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 10 Sep 2020 15:22:04 +0200 Subject: [PATCH] build(cmake): mp-units-config.cmake file added with explicit dependencies Addresses some of the issues mentioned in #156. --- cmake/mp-units-config.cmake.in | 26 ++++++++++++++++++++++++++ src/CMakeLists.txt | 2 +- test_package/conanfile.py | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 cmake/mp-units-config.cmake.in diff --git a/cmake/mp-units-config.cmake.in b/cmake/mp-units-config.cmake.in new file mode 100644 index 00000000..e7af50c3 --- /dev/null +++ b/cmake/mp-units-config.cmake.in @@ -0,0 +1,26 @@ +# The MIT License (MIT) +# +# Copyright (c) 2018 Mateusz Pusz +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +include(CMakeFindDependencyMacro) +find_dependency(fmt) +find_dependency(Microsoft.GSL) +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dd4a831..74330cae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -105,4 +105,4 @@ install(DIRECTORY include/units ) # generate configuration files and install the package -configure_and_install(../cmake/common/simple-config.cmake.in mp-units SameMajorVersion) +configure_and_install(../cmake/mp-units-config.cmake.in mp-units SameMajorVersion) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index e4065902..944dc08a 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -25,7 +25,7 @@ import os class TestPackageConan(ConanFile): settings = "os", "compiler", "build_type", "arch" - generators = "cmake" + generators = "cmake", "cmake_find_package" def build(self): cmake = CMake(self)