Skip to content

Commit 7a9ddc5

Browse files
committed
Fixed FL parser language version argument; passed CMake generator
variable down.
1 parent e158a4f commit 7a9ddc5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if(${BUILD_WAVESABRE_CONVERT} AND ${DOWNLOAD_MONAD_FL_PARSER})
5050
SOURCE_DIR ${MONAD_FL_PARSER_DIR}
5151
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Monad.FLParser
5252
GIT_REPOSITORY https://github.com/Kwarf/FLParser.git
53-
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/WaveSabreConvert/FLParser/CMakeLists.txt ${MONAD_FL_PARSER_DIR}/CMakeLists.txt && ${CMAKE_COMMAND} ${MONAD_FL_PARSER_DIR} -DMONAD_FL_PARSER_DIR=${MONAD_FL_PARSER_DIR}
53+
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/WaveSabreConvert/FLParser/CMakeLists.txt ${MONAD_FL_PARSER_DIR}/CMakeLists.txt && ${CMAKE_COMMAND} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} ${MONAD_FL_PARSER_DIR} -DMONAD_FL_PARSER_DIR=${MONAD_FL_PARSER_DIR}
5454
BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/Monad.FLParser --config Release -- -m
5555
INSTALL_COMMAND ""
5656
)

WaveSabreConvert/FLParser/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ project(Monad.FLParser LANGUAGES CSharp)
44

55
cmake_policy(SET CMP0057 NEW)
66
include(CSharpUtilities)
7-
set(CMAKE_CSharp_FLAGS ${CMAKE_CSharp_FLAGS} "/langversion:6")
7+
8+
# Note: The space suffix is required for the flag to work correctly.
9+
set(CMAKE_CSharp_FLAGS "/langversion:latest ")
810

911
set(MONAD_FL_PARSER_SOURCES
1012
${MONAD_FL_PARSER_DIR}/Properties/AssemblyInfo.cs

0 commit comments

Comments
 (0)