diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-01-16 18:57:29 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-01-16 18:57:29 +0000 |
| commit | 8db4bc2499a43afe57fca8589a43d7ee30cd1b86 (patch) | |
| tree | b36159df3b1ce08563d637538a6d39e9d936aa4e /cmake/modules/FindYACC.cmake | |
| parent | 62249477b6b159e929ac4f94bf5e3c38c475636d (diff) | |
| download | wireshark-8db4bc2499a43afe57fca8589a43d7ee30cd1b86.tar.gz | |
More Chocolatey lex/yacc updates.
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh
Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.
svn path=/trunk/; revision=54828
Diffstat (limited to 'cmake/modules/FindYACC.cmake')
| -rw-r--r-- | cmake/modules/FindYACC.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake index f71650b036..0bbd287484 100644 --- a/cmake/modules/FindYACC.cmake +++ b/cmake/modules/FindYACC.cmake @@ -6,6 +6,12 @@ # INCLUDE(FindCygwin) +#INCLUDE(FindChocolatey) + +# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are +# currently unusable without some manual adjustments to the +# win_flex and win_bison wrapper scripts. Calling the executables +# directly should work. FIND_PROGRAM(YACC_EXECUTABLE NAMES @@ -13,6 +19,8 @@ FIND_PROGRAM(YACC_EXECUTABLE yacc PATHS ${CYGWIN_INSTALL_PATH}/bin +# ${CHOCOLATEY_INSTALL_PATH}/bin +# ${CHOCOLATEY_INSTALL_PATH}/lib/winflexbison.2.4.1.20140103/tools /bin /usr/bin /usr/local/bin |