diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-14 17:01:07 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-14 17:01:07 +0000 |
| commit | 1a10b261d0c810efe56a84ead44eb841762fb5c6 (patch) | |
| tree | ac4a785dbdb4ee399709b300759296512e25fdf2 | |
| parent | 2dd8a732f3073c8e90a8c7f1a3de189758aac698 (diff) | |
| download | mariadb-git-1a10b261d0c810efe56a84ead44eb841762fb5c6.tar.gz | |
Add some hints for finding bison on its usual locations on Windows.
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | cmake/bison.cmake | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index c17c0c3bb77..22939d496c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ version: build-{build}~branch-{branch} before_build: - md %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: project: win_build\MySQL.sln diff --git a/cmake/bison.cmake b/cmake/bison.cmake index 0892a213d04..7cf5b0c67d9 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") |