mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-31 02:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved usage of the library as a dependency

Browse Source
This commit is contained in:
Mateusz Pusz
2020-04-05 10:20:40 +02:00
parent e9e54938d4
commit 7bba350be0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/common

Submodule cmake/common updated: 6a92dc3f21...1c11b6ed26

4
conanfile.py
View File

@ -67,7 +67,7 @@ class UnitsConan(ConanFile):
cmake.configure() cmake.configure()
else: else:
# consumer's mode (library sources only) # consumer's mode (library sources only)
cmake.configure(source_folder=folder, build_folder=folder) cmake.configure(source_folder=folder)
return cmake return cmake
def configure(self): def configure(self):
@ -95,7 +95,7 @@ class UnitsConan(ConanFile):
cmake = self._configure_cmake() cmake = self._configure_cmake()
cmake.build() cmake.build()
if self._run_tests: if self._run_tests:
cmake.test() cmake.test(output_on_failure=True)
def package(self): def package(self):
self.copy(pattern="LICENSE.md", dst="licenses") self.copy(pattern="LICENSE.md", dst="licenses")

3
src/CMakeLists.txt
View File

@ -33,6 +33,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# include common tools and workarounds # include common tools and workarounds
include(common/cmake/scripts) include(common/cmake/scripts)
# use Conan configuration if available
conan_init(cmake)
# library definition # library definition
add_library(units INTERFACE) add_library(units INTERFACE)
#target_sources(units INTERFACE #target_sources(units INTERFACE