diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindReadline.cmake | 4 | ||||
| -rw-r--r-- | cmake/Helpers.cmake | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake index 2448f73cb..16dd72236 100644 --- a/cmake/FindReadline.cmake +++ b/cmake/FindReadline.cmake @@ -2,6 +2,8 @@ # Readline_FOUND - system has Readline lib # Readline_INCLUDE_DIR - the Readline include directory # Readline_LIBRARIES - Libraries needed to use Readline +# Readline_COMPENTRY_FUNC_RETURNS_CHARPTR - Indicates if compentry function +# returns a (char *) find_path(Readline_INCLUDE_DIR NAMES readline/readline.h) find_library(Readline_LIBRARIES NAMES readline) @@ -19,6 +21,8 @@ if(Readline_INCLUDE_DIR) int main() { rl_completion_entry_function = foo; return 0; }" Readline_COMPENTRY_FUNC_RETURNS_CHARPTR ) + unset(CMAKE_REQUIRED_QUIET) + unset(CMAKE_REQUIRED_LIBRARIES) endif() include(FindPackageHandleStandardArgs) diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake index 86008e0d2..ec7216452 100644 --- a/cmake/Helpers.cmake +++ b/cmake/Helpers.cmake @@ -1,6 +1,7 @@ include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) +# Add a C flag to the global list of C flags. macro(add_c_flag flag) if(CMAKE_C_FLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") @@ -10,6 +11,7 @@ macro(add_c_flag flag) message(STATUS "Configuring with C flag '${flag}'") endmacro() +# Add a CXX flag to the global list of CXX flags. macro(add_cxx_flag flag) if(CMAKE_CXX_FLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") @@ -19,11 +21,13 @@ macro(add_cxx_flag flag) message(STATUS "Configuring with CXX flag '${flag}'") endmacro() +# Add a C and CXX flag to the global list of C/CXX flags. macro(add_c_cxx_flag flag) add_c_flag(${flag}) add_cxx_flag(${flag}) endmacro() +# Check if C flag is supported and add to global list of C flags. macro(add_check_c_flag flag) string(REGEX REPLACE "[-=]" "_" flagname ${flag}) check_c_compiler_flag("${flag}" HAVE_FLAG${flagname}) @@ -32,6 +36,7 @@ macro(add_check_c_flag flag) endif() endmacro() +# Check if CXX flag is supported and add to global list of CXX flags. macro(add_check_cxx_flag flag) string(REGEX REPLACE "[-=]" "_" flagname ${flag}) check_cxx_compiler_flag("${flag}" HAVE_FLAG${flagname}) @@ -40,11 +45,14 @@ macro(add_check_cxx_flag flag) endif() endmacro() +# Check if C/CXX flag is supported and add to global list of C/CXX flags. macro(add_check_c_cxx_flag flag) add_check_c_flag(${flag}) add_check_cxx_flag(${flag}) endmacro() +# Add required CXX flag. Configuration fails if the CXX flag is not supported +# by the compiler. macro(add_required_cxx_flag flag) string(REGEX REPLACE "[-=]" "_" flagnamename ${flag}) check_cxx_compiler_flag("${flag}" HAVE_FLAG${flagname}) @@ -54,6 +62,8 @@ macro(add_required_cxx_flag flag) add_cxx_flag(${flag}) endmacro() +# Add required C flag. Configuration fails if the C flag is not supported by +# the compiler. macro(add_required_c_flag flag) string(REGEX REPLACE "[-=]" "_" flagname ${flag}) check_c_compiler_flag("${flag}" HAVE_FLAG${flagname}) @@ -63,6 +73,8 @@ macro(add_required_c_flag flag) add_c_flag(${flag}) endmacro() +# Add requied C/CXX flag. Configuration fails if the C/CXX flag is not +# supported by the compiler. macro(add_required_c_cxx_flag flag) add_required_c_flag(${flag}) add_required_cxx_flag(${flag}) |