Merge pull request #82 from PengZheng/fix_conan

Fix conan package.
argtable · Jan 6, 2024 · a30503d · a30503d
2 parents 55c4f62 + d1500dd
commit a30503d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -98,6 +98,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
@@ -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
-    "$<TARGET_FILE:argtable3>"
+    "$<TARGET_FILE:argtable3::argtable3>"
     "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
   )
 

diff --git 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')