From 79cd5ee2b258875c35134dfd32cb70ba801463db Mon Sep 17 00:00:00 2001
From: Raphael Boucherie <raphael.boucherie@inria.fr>
Date: Mon, 12 Jun 2017 10:35:46 +0200
Subject: [PATCH] Minor on FindLIBHQR
---
cmake_modules/FindLIBHQR.cmake | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/cmake_modules/FindLIBHQR.cmake b/cmake_modules/FindLIBHQR.cmake
index 912d71d87..059940151 100644
--- a/cmake_modules/FindLIBHQR.cmake
+++ b/cmake_modules/FindLIBHQR.cmake
@@ -6,30 +6,36 @@
# LIBHQR_DEFINITIONS - Compiler switches required for using LIBHQR
find_package(PkgConfig)
-pkg_check_modules(PC_LIBHQR QUIET libhqr)
-set(LIBHQR_DEFINITIONS ${PC_LIBHQR_CFLAGS_OTHER})
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_LIBHQR QUIET libhqr)
+endif()
find_path(
LIBHQR_INCLUDE_DIR
libhqr.h
- HINTS ${PC_LIBHQR_INCLUDEDIR}
- ${PC_LIBHQR_INCLUDE_DIRS}
+ HINTS ${LIBHQR_DIR} ${PC_LIBHQR_INCLUDEDIR} ${PC_LIBHQR_INCLUDE_DIRS}
+ PATH_SUFFIXES include include/libhqr
)
find_library(
LIBHQR_LIBRARY
NAMES hqr
- HINTS ${PC_LIBHQR_LIBDIR} ${PC_LIBHQR_LIBRARY_DIRS}
+ HINTS ${LIBHQR_DIR} ${PC_LIBHQR_LIBDIR} ${PC_LIBHQR_LIBRARY_DIRS}
+ PATH_SUFFIXES lib lib32 lib64 lib/libhqr lib32/libhqr lib64/libhqr
)
+set(LIBHQR_DIR "" CACHE PATH "Path where LIBHQR was installed")
+
+
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments
# and set LIBHQR_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(
- LIBHQR DEFAULT_MSG LIBHQR_LIBRARY LIBHQR_INCLUDE_DIR)
+ LIBHQR DEFAULT_MSG LIBHQR_LIBRARY LIBHQR_INCLUDE_DIR)
mark_as_advanced(LIBHQR_INCLUDE_DIR LIBHQR_LIBRARY )
set(LIBHQR_LIBRARIES ${LIBHQR_LIBRARY} )
set(LIBHQR_INCLUDE_DIRS ${LIBHQR_INCLUDE_DIR} )
+set(LIBHQR_DEFINITIONS ${PC_LIBHQR_CFLAGS_OTHER} )
--
GitLab