1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some hints for finding bison on its usual locations on Windows.

Browse Source
This commit is contained in:
Vladislav Vaintroub 2018-02-14 17:01:07 +00:00
parent 2dd8a732f3
commit 1a10b261d0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -3,7 +3,7 @@ version: build-{build}~branch-{branch}
before_build: before_build:
- md %APPVEYOR_BUILD_FOLDER%\win_build - md %APPVEYOR_BUILD_FOLDER%\win_build
- cd %APPVEYOR_BUILD_FOLDER%\win_build - cd %APPVEYOR_BUILD_FOLDER%\win_build
- cmake .. -G "Visual Studio 15 2017 Win64" -DWITH_UNIT_TESTS=0 -DBISON_EXECUTABLE=C:\cygwin\bin\bison - cmake .. -G "Visual Studio 15 2017 Win64" -DWITH_UNIT_TESTS=0
build: build:
project: win_build\MySQL.sln project: win_build\MySQL.sln

11
cmake/bison.cmake
View File

@ -20,7 +20,16 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
SET(BISON_EXECUTABLE /opt/csw/bin/bison) SET(BISON_EXECUTABLE /opt/csw/bin/bison)
ENDIF() ENDIF()
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 "") MARK_AS_ADVANCED(BISON_EXECUTABLE "")
IF(NOT BISON_EXECUTABLE) IF(NOT BISON_EXECUTABLE)
MESSAGE("Warning: Bison executable not found in PATH") MESSAGE("Warning: Bison executable not found in PATH")