Changeset: 4aac45df982e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4aac45df982e Branch: Sep2022 Log Message:
Merge with Jan2022 branch. diffs (41 lines): diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake --- a/cmake/Modules/FindReadline.cmake +++ b/cmake/Modules/FindReadline.cmake @@ -9,22 +9,24 @@ find_package(PkgConfig QUIET) pkg_check_modules(PC_READLINE QUIET readline>=8.0) if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR PC_READLINE_FOUND) + if(NOT WIN32) -# Look for the header file. -find_path(READLINE_INCLUDE_DIR NAMES readline/readline.h - HINTS - ${PC_READLINE_INCLUDEDIR} - ${PC_READLINE_INCLUDE_DIRS} - PATH_SUFFIXES readline - ) + # Look for the header file. + find_path(READLINE_INCLUDE_DIR NAMES readline/readline.h + HINTS + ${PC_READLINE_INCLUDEDIR} + ${PC_READLINE_INCLUDE_DIRS} + PATH_SUFFIXES readline + ) -# Look for the library. -find_library(READLINE_LIBRARIES NAMES readline - HINTS - ${PC_READLINE_LIBDIR} - ${PC_READLINE_LIBRARY_DIRS} - ) + # Look for the library. + find_library(READLINE_LIBRARIES NAMES readline + HINTS + ${PC_READLINE_LIBDIR} + ${PC_READLINE_LIBRARY_DIRS} + ) + endif() endif() # Handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND to TRUE if all listed variables are TRUE. _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org