diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-19 11:37:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-19 11:37:29 +0200 |
| commit | 2ba487cfe8bd95b90a537a5e9e54b5c1a5a35f37 (patch) | |
| tree | d807814af6a0e1bb93b9f0060244220a0830dcc8 /cmake | |
| parent | afc56a509cc7d3d651ca68ad826ca183da8dc7cc (diff) | |
| parent | ef3147b1d64b298486fc6f77f9e84b28a9d1c5b3 (diff) | |
| download | mariadb-git-2ba487cfe8bd95b90a537a5e9e54b5c1a5a35f37.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/bison.cmake | 11 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 11 |
2 files changed, 17 insertions, 5 deletions
diff --git a/cmake/bison.cmake b/cmake/bison.cmake index 0e4a7b58a13..d825e407b22 100644 --- a/cmake/bison.cmake +++ b/cmake/bison.cmake @@ -20,7 +20,16 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") SET(BISON_EXECUTABLE /opt/csw/bin/bison) ENDIF() ENDIF() -FIND_PROGRAM(BISON_EXECUTABLE bison DOC "path to the bison executable") +IF(WIN32) + SET(BISON_PATH_HINTS + HINTS + C:/gnuwin32/bin + C:/cygwin64/bin + C:/cygwin/bin) +ENDIF() +FIND_PROGRAM(BISON_EXECUTABLE bison + ${BISON_PATH_HINTS} + DOC "path to the bison executable") MARK_AS_ADVANCED(BISON_EXECUTABLE "") IF(NOT BISON_EXECUTABLE) MESSAGE("Warning: Bison executable not found in PATH") diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 104c3899507..aa948a7f5b2 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -24,9 +24,6 @@ INCLUDE (CheckCSourceRuns) INCLUDE (CheckSymbolExists) INCLUDE (CheckTypeSize) -# Optionally read user configuration, generated by configure.js. -# This is left for backward compatibility reasons only. -INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL) # avoid running system checks by using pre-cached check results # system checks are expensive on VS since every tiny program is to be compiled in @@ -63,6 +60,8 @@ IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4) ENDIF() IF(MSVC) + # Disable mingw based pkg-config found in Strawberry perl + SET(PKG_CONFIG_EXECUTABLE 0 CACHE INTERNAL "") SET(MSVC_CRT_TYPE /MT CACHE STRING "Runtime library - specify runtime library for linking (/MT,/MTd,/MD,/MDd)" ) @@ -156,7 +155,11 @@ IF(MSVC) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") ENDIF() - + IF(MSVC_VERSION LESS 1910) + # Noisy warning C4800: 'type': forcing value to bool 'true' or 'false' (performance warning), + # removed in VS2017 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800") + ENDIF() ENDIF() # Always link with socket library |