From d1500ddf74c84a2072103af4003d325e83cbf94f Mon Sep 17 00:00:00 2001 From: PengZheng Date: Tue, 22 Nov 2022 20:57:57 +0800 Subject: [PATCH] Fix conan package. 1. let argtable3 target carry include dir. 2. fix wrong target name in test_package. 3. skip running test binary when in cross mode. --- src/CMakeLists.txt | 1 + test_package/CMakeLists.txt | 2 +- test_package/conanfile.py | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2e0b519..39d328c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,6 +95,7 @@ endif() install(TARGETS argtable3 EXPORT ${ARGTABLE3_PACKAGE_NAME}Config + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index eeaba02..2dcca14 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -47,7 +47,7 @@ if (CONAN_SETTINGS_OS) target_link_libraries(${PROJECT_NAME} PUBLIC argtable3::argtable3 ${ARGTABLE3_EXTRA_LIBS}) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - "$" + "$" "$" ) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 4f69b3f..0418a17 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -14,5 +14,6 @@ def build(self): cmake.build() def test(self): - with tools.environment_append(RunEnvironment(self).vars): - self.run('ctest -C Debug --output-on-failure') + if not tools.cross_building(self, skip_x64_x86=True): + with tools.environment_append(RunEnvironment(self).vars): + self.run('ctest -C Debug --output-on-failure')