Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge topic 'fix-win-flex-bison' into release-3.18

0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4931
Brad King 5 years ago
parent
df69cb37d1 0faa2b9870
commit
069e904337
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      Modules/FindBISON.cmake
  2. 1 1
      Modules/FindFLEX.cmake

+ 1 - 1
Modules/FindBISON.cmake
View File 

@@ -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)

+ 1 - 1
Modules/FindFLEX.cmake
View File 

@@ -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