From cf590fbdaaf418599537dd39ad223b432aac1de9 Mon Sep 17 00:00:00 2001 From: Adam Wegrzynek Date: Mon, 10 Oct 2022 14:29:48 +0200 Subject: [PATCH] [OMON-607] Look for ApMon just in APMON_ROOT (#306) --- CMakeLists.txt | 2 +- cmake/FindApMon.cmake | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fb461cba..87c5e5107 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ endif() # Define project project(Monitoring - VERSION 3.14.0 + VERSION 3.14.1 DESCRIPTION "O2 Monitoring library" LANGUAGES CXX ) diff --git a/cmake/FindApMon.cmake b/cmake/FindApMon.cmake index fb61f718c..84d7ac798 100644 --- a/cmake/FindApMon.cmake +++ b/cmake/FindApMon.cmake @@ -16,16 +16,18 @@ include(FindPackageHandleStandardArgs) # find includes find_path(ApMon_INCLUDE_DIR ApMon.h - HINTS ${APMON_ROOT} /usr/local + PATHS ${APMON_ROOT} PATH_SUFFIXES include + NO_DEFAULT_PATH ) mark_as_advanced(ApMon_INCLUDE_DIR) # find library find_library(ApMon_LIBRARY NAMES apmoncpp - HINTS ${APMON_ROOT} /usr/local + PATHS ${APMON_ROOT} PATH_SUFFIXES lib lib64 + NO_DEFAULT_PATH ) mark_as_advanced(ApMon_LIBRARY)