MSYS2/MinGW: Disable Regex

This commit is contained in:
Robin Mills
2018-10-15 17:50:05 +01:00
committed by Luis Díaz Más
parent 42084f2563
commit 87278e6be3
2 changed files with 26 additions and 22 deletions
+23 -21
View File
@@ -11,38 +11,40 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if ( NOT MSVC AND NOT MINGW AND NOT MSYS )
find_path(Regex_INCLUDE_DIR
NAMES regex.h
DOC "libregex include directory"
)
find_path(Regex_INCLUDE_DIR
NAMES regex.h
DOC "libregex include directory"
)
mark_as_advanced(Regex_INCLUDE_DIR)
mark_as_advanced(Regex_INCLUDE_DIR)
find_library(Regex_LIBRARY "regex"
DOC "libregex libraries"
)
find_library(Regex_LIBRARY "regex"
DOC "libregex libraries"
)
mark_as_advanced(Regex_LIBRARY)
mark_as_advanced(Regex_LIBRARY)
find_package_handle_standard_args(Regex
FOUND_VAR Regex_FOUND
REQUIRED_VARS Regex_INCLUDE_DIR
FAIL_MESSAGE "Failed to find libregex"
)
find_package_handle_standard_args(Regex
FOUND_VAR Regex_FOUND
REQUIRED_VARS Regex_INCLUDE_DIR
FAIL_MESSAGE "Failed to find libregex"
)
if(REGEX_FOUND)
if(REGEX_FOUND)
set(REGEX_INCLUDE_DIRS ${Regex_INCLUDE_DIRS})
set(REGEX_INCLUDE_DIRS ${Regex_INCLUDE_DIRS})
if(Regex_LIBRARY)
if(Regex_LIBRARY)
set(REGEX_LIBRARIES ${Regex_LIBRARY})
set(REGEX_LIBRARIES ${Regex_LIBRARY})
else()
else()
unset(REGEX_LIBRARIES)
unset(REGEX_LIBRARIES)
endif()
endif()
endif()
+3 -1
View File
@@ -39,8 +39,10 @@ check_include_file( "strings.h" EXV_HAVE_STRINGS_H )
check_include_file( "sys/mman.h" EXV_HAVE_SYS_MMAN_H )
check_include_file( "sys/stat.h" EXV_HAVE_SYS_STAT_H )
check_include_file( "sys/types.h" EXV_HAVE_SYS_TYPES_H )
check_include_file( "regex.h" EXV_HAVE_REGEX_H )
check_include_file( "inttypes.h" EXV_HAVE_INTTYPES_H )
if ( NOT MINGW AND NOT MSYS AND NOT MSVC )
check_include_file( "regex.h" EXV_HAVE_REGEX_H )
endif()
if (NOT EXV_HAVE_LIBINTL_H)
set(EXV_ENABLE_NLS 0)