Browse Source

fix: Travis CI failed to run Conan package manager

pull/31/head
Tom G. Huang 6 years ago
parent
commit
c56152bba0
  1. 2
      CMakeLists.txt
  2. 3
      test_package/CMakeLists.txt

2
CMakeLists.txt

@ -93,7 +93,7 @@ if(UNIX)
include(GNUInstallDirs)
set(ARGTABLE3_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
set(ARGTABLE3_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
set(ARGTABLE3_INSTALL_CMAKEDIR ${ARGTABLE3_LIBDIR}/cmake)
set(ARGTABLE3_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake)
elseif(WIN32)
set(ARGTABLE3_INSTALL_LIBDIR "lib")
set(ARGTABLE3_INSTALL_INCLUDEDIR "include")

3
test_package/CMakeLists.txt

@ -38,7 +38,8 @@ conan_basic_setup()
enable_testing()
if (CONAN_SETTINGS_OS)
find_package(argtable3 REQUIRED)
set(Argtable3_DIR ${CONAN_LIB_DIRS_ARGTABLE3}/cmake)
find_package(Argtable3 REQUIRED)
add_executable(${PROJECT_NAME} testargtable3.c)
target_link_libraries(${PROJECT_NAME} PUBLIC argtable3)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD

Loading…
Cancel
Save