From: Andrew V. Jones <andrew.jones@vector.com>
Date: Thu, 30 Jul 2020 15:51:42 +0000 (+0100)
Subject: When linking Editline, use 'pkg-config' to correctly find the link-time dependencies... 
X-Git-Tag: cvc5-1.0.0~3068
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e142a47195faba468d523660710bedc05f6591dd;p=cvc5.git

When linking Editline, use 'pkg-config' to correctly find the link-time dependencies (#4809)

Signed-off-by: Andrew V. Jones <andrew.jones@vector.com>
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74c65cfac..498146bdb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,6 +85,7 @@ jobs:
           cxxtest \
           cln \
           gmp \
+          pkgconfig \
           swig
         python3 -m pip install toml
         python3 -m pip install setuptools
diff --git a/cmake/FindEditline.cmake b/cmake/FindEditline.cmake
index fe4001173..aa4b90d7a 100644
--- a/cmake/FindEditline.cmake
+++ b/cmake/FindEditline.cmake
@@ -1,20 +1,22 @@
 # Find Editline
 # Editline_FOUND - found Editline lib
-# Editline_INCLUDE_DIR - the Editline include directory
+# Editline_INCLUDE_DIRS - the Editline include directory
 # Editline_LIBRARIES - Libraries needed to use Editline
 # Editline_COMPENTRY_FUNC_RETURNS_CHARPTR - Indicates if compentry function
 #                                           returns a (char *)
 
-find_path(Editline_INCLUDE_DIR NAMES histedit.h)
-find_library(Editline_LIBRARIES NAMES edit libedit)
+# When finding libedit, use pkg-config to ensure we find all the required
+# linking flags for libedit
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(Editline REQUIRED libedit)
 
-if(Editline_INCLUDE_DIR)
+if(Editline_INCLUDE_DIRS)
   # Check which standard of editline is installed on the system.
   # https://github.com/CVC4/CVC4/issues/702
   include(CheckCXXSourceCompiles)
   set(CMAKE_REQUIRED_QUIET TRUE)
   set(CMAKE_REQUIRED_LIBRARIES ${Editline_LIBRARIES})
-  set(CMAKE_REQUIRED_INCLUDES ${Editline_INCLUDE_DIR})
+  set(CMAKE_REQUIRED_INCLUDES ${Editline_INCLUDE_DIRS})
   check_cxx_source_compiles(
     "#include <stdio.h>
      #include <editline/readline.h>
@@ -29,9 +31,9 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Editline
-  DEFAULT_MSG Editline_INCLUDE_DIR Editline_LIBRARIES)
+  DEFAULT_MSG Editline_INCLUDE_DIRS Editline_LIBRARIES)
 mark_as_advanced(
-  Editline_INCLUDE_DIR
+  Editline_INCLUDE_DIRS
   Editline_LIBRARIES
   Editline_COMPENTRY_FUNC_RETURNS_CHARPTR
 )
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index c168daeaa..ae0f8015b 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -71,7 +71,7 @@ endif()
 if(USE_EDITLINE)
   target_link_libraries(cvc4-bin ${Editline_LIBRARIES})
   target_link_libraries(main-test ${Editline_LIBRARIES})
-  target_include_directories(main PRIVATE ${Editline_INCLUDE_DIR})
+  target_include_directories(main PRIVATE ${Editline_INCLUDE_DIRS})
 endif()
 
 #-----------------------------------------------------------------------------#