Index: .arcconfig =================================================================== --- /dev/null +++ .arcconfig @@ -0,0 +1,3 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/" +} Index: autotests/CMakeLists.txt =================================================================== --- autotests/CMakeLists.txt +++ autotests/CMakeLists.txt @@ -1,4 +1,5 @@ include_directories(BEFORE ../src) +include_directories(PUBLIC PRIVATE ${LIBOATH_INCLUDE_DIRS}) add_subdirectory(base32) add_subdirectory(validators) Index: cmake/FindLibOath.cmake =================================================================== --- cmake/FindLibOath.cmake +++ cmake/FindLibOath.cmake @@ -53,9 +53,8 @@ pkg_check_modules(PC_LIBOATH QUIET liboath) find_path(LIBOATH_INCLUDE_DIRS - NAMES oath.h - HINTS ${PC_LIBOATH_INCLUDEDIR} - PATH_SUFFIXES liboath) + NAMES liboath/oath.h + HINTS ${PC_LIBOATH_INCLUDEDIR}) find_library(LIBOATH_LIBRARIES NAMES oath Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt +++ src/CMakeLists.txt @@ -11,6 +11,7 @@ qt5_add_resources(RESOURCES resources.qrc) add_executable(keysmith ${keysmith_SRCS} ${RESOURCES}) +target_include_directories(keysmith SYSTEM PRIVATE ${LIBOATH_INCLUDE_DIRS}) target_link_libraries(keysmith Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg KF5::I18n Index: src/base32/CMakeLists.txt =================================================================== --- src/base32/CMakeLists.txt +++ src/base32/CMakeLists.txt @@ -5,4 +5,5 @@ set(base32_SRCS base32.cpp) add_library(base32_lib STATIC ${base32_SRCS}) +target_include_directories(base32_lib SYSTEM PRIVATE ${LIBOATH_INCLUDE_DIRS}) target_link_libraries(base32_lib Qt5::Core ${LIBOATH_LIBRARIES})