Skip to content

Commit a1b0783

Browse files
Revert Sfx/CMakeLists.txt to be compatiable with CMake 3.31.
1 parent 39a8c84 commit a1b0783

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Applications/Sfx/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ if(PLATFORM_WINDOWS OR PLATFORM_LINUX)
1717
find_package(BISON REQUIRED)
1818
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles")
1919
# If you want to disable line directives in Flex, use -L. For Bison, use -l.
20-
set(FLEX_OPTIONS "")
21-
set(BISON_OPTIONS -Wno-conflicts-sr -Wno-conflicts-rr) # use -Wno-conflicts-sr; -Wno-conflicts-rr for Bison to debug shift-reduce conflicts.
20+
set(FLEX_FLAGS "")
21+
set(BISON_FLAGS "-Wno-conflicts-sr -Wno-conflicts-rr") # use -Wno-conflicts-sr; -Wno-conflicts-rr for Bison to debug shift-reduce conflicts.
2222
# specify FULL PATH to Preprocessor.lpp etc, so Flex and Bison will give us clickable warning/error messages.
23-
flex_target(PreprocessorLexer ${CMAKE_CURRENT_SOURCE_DIR}/Preprocessor.lpp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorLexer.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorLexer.h" OPTIONS ${FLEX_OPTIONS} )
24-
bison_target(PreprocessorParser ${CMAKE_CURRENT_SOURCE_DIR}/Preprocessor.ypp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorParser.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorParser.h" OPTIONS ${BISON_OPTIONS} )
23+
flex_target(PreprocessorLexer ${CMAKE_CURRENT_SOURCE_DIR}/Preprocessor.lpp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorLexer.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorLexer.h" COMPILE_FLAGS ${FLEX_FLAGS} )
24+
bison_target(PreprocessorParser ${CMAKE_CURRENT_SOURCE_DIR}/Preprocessor.ypp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorParser.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/PreprocessorParser.h" COMPILE_FLAGS ${BISON_FLAGS} )
2525

26-
flex_target(SfxScanner ${CMAKE_CURRENT_SOURCE_DIR}/Sfx.lpp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxScanner.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxScanner.h" OPTIONS ${FLEX_OPTIONS} )
27-
bison_target(SfxLALRParser ${CMAKE_CURRENT_SOURCE_DIR}/Sfx.ypp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxLALRParser.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxLALRParser.hpp" OPTIONS ${BISON_OPTIONS} )
26+
flex_target(SfxScanner ${CMAKE_CURRENT_SOURCE_DIR}/Sfx.lpp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxScanner.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxScanner.h" COMPILE_FLAGS ${FLEX_FLAGS} )
27+
bison_target(SfxLALRParser ${CMAKE_CURRENT_SOURCE_DIR}/Sfx.ypp "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxLALRParser.cpp" DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles/SfxLALRParser.hpp" COMPILE_FLAGS ${BISON_FLAGS} )
2828

2929
ADD_FLEX_BISON_DEPENDENCY(PreprocessorLexer PreprocessorParser)
3030
ADD_FLEX_BISON_DEPENDENCY(SfxScanner SfxLALRParser)

0 commit comments

Comments
 (0)