Skip to content

CMake: bump and fix readline detection #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sigmanificient wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CMake: bump and fix readline detection #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f58eb9b
Fix cmake module so that it can find readline.
astrorigin Mar 2, 2023
b9806df
Update cmake minimum version >= 3.16.3 (ubuntu FF)
astrorigin Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# List of available modules: CURL DBI DBUS DYNLIB GD2 GTK PDF SDL
#

cmake_minimum_required(VERSION 2.6.2)
cmake_minimum_required(VERSION 3.16.3)
project(Falcon)


Expand Down
2 changes: 1 addition & 1 deletion apps/faldoc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# CMake configuration file for Feather modules
####################################################################

cmake_minimum_required(VERSION 2.6.2)
cmake_minimum_required(VERSION 3.16.3)
project(falcon-app-faldoc)

set(FALDOC_DIR "${FALCON_APP_DIR}/faldoc" )
Expand Down
4 changes: 2 additions & 2 deletions clt/falcon/editline/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
project(Editline)

find_package(Curses REQUIRED)
Expand All @@ -23,4 +23,4 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config.h
)


44 changes: 26 additions & 18 deletions cmake/modules/FindEditline.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
option(FALCON_WITH_GPL_READLINE "" off)
if(FALCON_WITH_GPL_READLINE)
set(_header readline/readline.h)
set(_libname readline)
### FindEditLine.cmake module for Falcon

option( FALCON_WITH_GPL_READLINE "Insist on using GNU readline" OFF )

# unset these so that we can actually find GNU readline
unset( Editline_INCLUE_DIR CACHE )
unset( Editline_LIBRARY CACHE )

if( FALCON_WITH_GPL_READLINE )
set( _header readline/readline.h )
set( _libname readline )
else()
set(_header editline/readline.h)
set(_libname edit)
set( _header editline/readline.h )
set( _libname edit )
endif()

find_path(Editline_INCLUE_DIR ${_header})
find_library(Editline_LIBRARY ${_libname})
find_path( Editline_INCLUE_DIR ${_header} )
find_library( Editline_LIBRARY ${_libname} )

include( CheckSymbolExists )
set( CMAKE_REQUIRED_INCLUDES ${Editline_INCLUE_DIR} )
set( CMAKE_REQUIRED_LIBRARIES ${Editline_LIBRARY} )
check_symbol_exists( rl_getc_function "${_header}" HAVE_RL_GETC_FUNCTION )

include(CheckSymbolExists)
set(CMAKE_REQUIRED_INCLUDES ${Editline_INCLUE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${Editline_LIBRARY})
check_symbol_exists(rl_getc_function "stdio.h;${_header}"
HAVE_RL_GETC_FUNCTION
)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( Editline DEFAULT_MSG
Editline_LIBRARY Editline_INCLUE_DIR HAVE_RL_GETC_FUNCTION )

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Editline DEFAULT_MSG Editline_LIBRARY Editline_INCLUE_DIR HAVE_RL_GETC_FUNCTION)
set( Editline_INCLUDE_DIRS ${Editline_INCLUE_DIR} )
set( Editline_LIBRARIES ${Editline_LIBRARY} )

set(Editline_INCLUDE_DIRS ${Editline_INCLUE_DIR})
set(Editline_LIBRARIES ${Editline_LIBRARY})
# vi: ts=2 sw=2 et
2 changes: 1 addition & 1 deletion dist/nsis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Configurator for NSIS installer
#
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)

#
# Files to be configured
Expand Down
2 changes: 1 addition & 1 deletion modules/native/MP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
####################################################################

PROJECT(MP)
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
# Set here project-wide options
# OPTION( WITH_OPT "An poption" OFF)
Expand Down
2 changes: 1 addition & 1 deletion modules/native/conio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# CMake configuration file for @PROJECT_NAME@
####################################################################

cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
project(conio)

# find the falcon installation. Set CMAKE_INSTALL_PREFIX to the falcon root
Expand Down
2 changes: 1 addition & 1 deletion modules/native/curl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# CMake configuration file for curl
####################################################################

cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
project(Falcon_curl)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

Expand Down
2 changes: 1 addition & 1 deletion modules/native/dbi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# CMake configuration file for DBI
####################################################################
cmake_minimum_required(VERSION 2.6.2)
cmake_minimum_required(VERSION 3.16.3)
project(Falcon_DBI)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
Expand Down
2 changes: 1 addition & 1 deletion modules/native/dbus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
####################################################################

PROJECT(dbus)
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)

INCLUDE( ${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)

Expand Down
2 changes: 1 addition & 1 deletion modules/native/dynlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# CMake configuration file for dynlib
####################################################################

cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
project(Falcon_dynlib)

find_package(Falcon REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion modules/native/feathers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# CMake configuration file for Feather modules
####################################################################
cmake_minimum_required(VERSION 2.6.2)
cmake_minimum_required(VERSION 3.16.3)
PROJECT(Falcon_Feathers)

# Find our Find*.cmake files
Expand Down
2 changes: 1 addition & 1 deletion modules/native/gd2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
####################################################################

PROJECT(gd2)
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
MESSAGE(STATUS "Building GD2 module" )


Expand Down
2 changes: 1 addition & 1 deletion modules/native/gtk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
project( gtk )

cmake_minimum_required( VERSION 2.6.3 )
cmake_minimum_required( VERSION 3.16.3 )

list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )

Expand Down
2 changes: 1 addition & 1 deletion modules/native/hpdf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# CMake configuration file for Feather modules
####################################################################

cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
project(falcon-module-hpdf)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
Expand Down
2 changes: 1 addition & 1 deletion modules/native/sdl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 OLD)
endif(COMMAND cmake_policy)
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)
PROJECT(Falcon_SDL)


Expand Down
2 changes: 1 addition & 1 deletion modules/native/wopi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Falcon Web Oriented Programming Interface
#

cmake_minimum_required(VERSION 2.6.2)
cmake_minimum_required(VERSION 3.16.3)
project( falcon_wopi )

######################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/native/dynlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# CMake configuration file for dynlib - TESTS
####################################################################
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.16.3)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
Expand Down