Parcourir la source

Build: When looking for flex/bison executables, always look in local folders first

BearishSun il y a 8 ans
Parent
commit
ada88ff618
2 fichiers modifiés avec 4 ajouts et 0 suppressions
  1. 2 0
      Source/CMake/Modules/Findbison.cmake
  2. 2 0
      Source/CMake/Modules/Findflex.cmake

+ 2 - 0
Source/CMake/Modules/Findbison.cmake

@@ -7,6 +7,8 @@
 set(bison_INSTALL_DIRS ${PROJECT_SOURCE_DIR}/../Dependencies/tools/bison CACHE PATH "")
 set(bison_INSTALL_DIRS ${PROJECT_SOURCE_DIR}/../Dependencies/tools/bison CACHE PATH "")
 
 
 message(STATUS "Looking for bison installation...")
 message(STATUS "Looking for bison installation...")
+
+find_program(bison_EXECUTABLE NAMES bison bin/bison PATHS ${bison_INSTALL_DIRS} NO_DEFAULT_PATH)
 find_program(bison_EXECUTABLE NAMES bison bin/bison PATHS ${bison_INSTALL_DIRS})
 find_program(bison_EXECUTABLE NAMES bison bin/bison PATHS ${bison_INSTALL_DIRS})
 
 
 if(bison_EXECUTABLE)
 if(bison_EXECUTABLE)

+ 2 - 0
Source/CMake/Modules/Findflex.cmake

@@ -7,6 +7,8 @@
 set(flex_INSTALL_DIRS ${PROJECT_SOURCE_DIR}/../Dependencies/tools/flex CACHE PATH "")
 set(flex_INSTALL_DIRS ${PROJECT_SOURCE_DIR}/../Dependencies/tools/flex CACHE PATH "")
 
 
 message(STATUS "Looking for flex installation...")
 message(STATUS "Looking for flex installation...")
+
+find_program(flex_EXECUTABLE NAMES flex bin/flex PATHS ${flex_INSTALL_DIRS} NO_DEFAULT_PATH)
 find_program(flex_EXECUTABLE NAMES flex bin/flex PATHS ${flex_INSTALL_DIRS})
 find_program(flex_EXECUTABLE NAMES flex bin/flex PATHS ${flex_INSTALL_DIRS})
 
 
 if(flex_EXECUTABLE)
 if(flex_EXECUTABLE)