mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-02 20:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Conan test_package fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2020-12-16 21:54:43 +01:00
parent 6ac08c2e3b
commit 6a23718969
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test_package/CMakeLists.txt
View File

@@ -23,20 +23,11 @@
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project(test_package) project(test_package)
# set path to custom cmake modules # enable package discovery based on the local configuration files
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") list(PREPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
# compilation options and flags used in a project development process
include(common/scripts)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(TARGETS)
# test conan-generated target
add_executable(${PROJECT_NAME}_conan test_package.cpp)
target_link_libraries(${PROJECT_NAME}_conan PRIVATE CONAN_PKG::mp-units)
# test cmake-generated target # test cmake-generated target
find_package(mp-units CONFIG REQUIRED) find_package(mp-units CONFIG REQUIRED)
add_executable(${PROJECT_NAME}_cmake test_package.cpp) add_executable(test_package test_package.cpp)
target_link_libraries(${PROJECT_NAME}_cmake PRIVATE mp-units::mp-units) target_link_libraries(test_package PRIVATE mp-units::mp-units)
target_compile_features(test_package PRIVATE cxx_std_20)

6
test_package/conanfile.py
View File

@@ -21,11 +21,10 @@
# SOFTWARE. # SOFTWARE.
from conans import ConanFile, CMake, tools, RunEnvironment from conans import ConanFile, CMake, tools, RunEnvironment
import os
class TestPackageConan(ConanFile): class TestPackageConan(ConanFile):
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
generators = "cmake", "cmake_find_package" generators = "cmake_find_package_multi"
def build(self): def build(self):
cmake = CMake(self) cmake = CMake(self)
@@ -34,5 +33,4 @@ class TestPackageConan(ConanFile):
def test(self): def test(self):
if not tools.cross_building(self.settings): if not tools.cross_building(self.settings):
self.run(os.path.join("bin", "test_package_conan"), run_environment=True) self.run("test_package", run_environment=True)
self.run(os.path.join("bin", "test_package_cmake"), run_environment=True)