From c56152bba0b9caf8de7ba5e16c6df2f3a5306420 Mon Sep 17 00:00:00 2001 From: "Tom G. Huang" Date: Tue, 2 Apr 2019 10:11:34 -0700 Subject: [PATCH] fix: Travis CI failed to run Conan package manager --- CMakeLists.txt | 2 +- test_package/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d7ff5..7317ca3 100644 --- a/CMakeLists.txt +++ b/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") diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 2ebc1aa..fccce2d 100644 --- a/test_package/CMakeLists.txt +++ b/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