[OMON-607] Look for ApMon just in APMON_ROOT (#306)

awegrzyn · web-flow · commit cf590fbdaaf4 · 2022-10-10T14:29:48.000+02:00
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ endif()`
`31`	`31`
`32`	`32`	`# Define project`
`33`	`33`	`project(Monitoring`
`34`		`- VERSION 3.14.0`
	`34`	`+ VERSION 3.14.1`
`35`	`35`	`DESCRIPTION "O2 Monitoring library"`
`36`	`36`	`LANGUAGES CXX`
`37`	`37`	`)`