summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-06-23 11:55:41 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-06-23 11:56:39 (GMT)
commit0a337716ceb81ec4cd15e9feee4e875cea787149 (patch)
treef7090fdc9cff01e18a7e9cf7940e73a9236c5580 /Modules
parentafea276621a31740b2599023e685011b4acfae7e (diff)
parent0faa2b98701a592cbd1f62e44aa327c410ee76a5 (diff)
downloadCMake-0a337716ceb81ec4cd15e9feee4e875cea787149.zip
CMake-0a337716ceb81ec4cd15e9feee4e875cea787149.tar.gz
CMake-0a337716ceb81ec4cd15e9feee4e875cea787149.tar.bz2
Merge topic 'fix-win-flex-bison'
0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4931
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindBISON.cmake2
-rw-r--r--Modules/FindFLEX.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index 6b5828e..1e1a5a3 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -82,7 +82,7 @@ Example usage:
add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
#]=======================================================================]
-find_program(BISON_EXECUTABLE NAMES bison win_bison DOC "path to the bison executable")
+find_program(BISON_EXECUTABLE NAMES bison win-bison win_bison DOC "path to the bison executable")
mark_as_advanced(BISON_EXECUTABLE)
if(BISON_EXECUTABLE)
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 90e5f86..1384736 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -99,7 +99,7 @@ respectively ``FLEX_TARGET`` and ``BISON_TARGET`` macros.
====================================================================
#]=======================================================================]
-find_program(FLEX_EXECUTABLE NAMES flex win_flex DOC "path to the flex executable")
+find_program(FLEX_EXECUTABLE NAMES flex win-flex win_flex DOC "path to the flex executable")
mark_as_advanced(FLEX_EXECUTABLE)
find_library(FL_LIBRARY NAMES fl