From f0173384c0a097daeaccb61a28c7f50279e12656 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Thu, 9 Jun 2016 22:48:45 +0200 Subject: [PATCH] Rez/CMakeLists.txt: Call bison directly, don't rely on bison_target (which seems to have changed in subtle ways) --- Rez/CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Rez/CMakeLists.txt b/Rez/CMakeLists.txt index c87d2f83f5..5cda44895f 100644 --- a/Rez/CMakeLists.txt +++ b/Rez/CMakeLists.txt @@ -33,14 +33,21 @@ if(Boost_FOUND AND BISON_FOUND) include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) -bison_target(RezParser RezParser.yy - ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.hh +set(BISON_OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.hh ${CMAKE_CURRENT_BINARY_DIR}/location.hh ${CMAKE_CURRENT_BINARY_DIR}/position.hh ${CMAKE_CURRENT_BINARY_DIR}/stack.hh) +add_custom_command(OUTPUT ${BISON_OUTPUTS} + COMMAND ${BISON_EXECUTABLE} + ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc RezParser.yy + DEPENDS RezParser.yy + COMMENT "[BISON][RezParser] Building parser with bison ${BISON_VERSION}" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_library(RezLib RezParser.yy - ${BISON_RezParser_OUTPUTS} + ${BISON_OUTPUTS} RezLexer.h RezLexer.cc