Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Unify the flex-generated code file hlslang_tab.cpp vs Gen_hlslang_tab…
….cpp to have the same name Gen_hlslang_tab.cpp on all platforms. Fixes using CMake to generate a Visual Studio 2010 solution file.
  • Loading branch information
juj committed Dec 11, 2012
1 parent 3322bb0 commit fd3b8af
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Expand Up @@ -105,7 +105,7 @@ EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"")

set(MACHINE_INDEPENDENT_GENERATED_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/hlslang/MachineIndependent/Gen_hlslang.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hlslang/MachineIndependent/hlslang_tab.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hlslang/MachineIndependent/Gen_hlslang_tab.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hlslang/MachineIndependent/hlslang_tab.h
)

Expand Down Expand Up @@ -180,10 +180,10 @@ elseif (UNIX)
source_group("OSDependent\\Linux" FILES ${OSDEPENDENT_FILES})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/hlslang/OSDependent/Linux)

add_custom_command(OUTPUT hlslang/MachineIndependent/hlslang_tab.cpp hlslang/MachineIndependent/hlslang_tab.h
add_custom_command(OUTPUT hlslang/MachineIndependent/Gen_hlslang_tab.cpp hlslang/MachineIndependent/hlslang_tab.h
COMMAND set ARGS "BISON_SIMPLE=../../tools/bison.simple"
COMMAND set ARGS "BISON_HAIRY=../../tools/bison.simple"
COMMAND bison ARGS -o hlslang_tab.cpp -d -t -v hlslang.y
COMMAND bison ARGS -o Gen_hlslang_tab.cpp -d -t -v hlslang.y
COMMAND mv hlslang_tab.hpp hlslang_tab.h
MAIN_DEPENDENCY hlslang/MachineIndependent/hlslang.y
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hlslang/MachineIndependent
Expand Down

0 comments on commit fd3b8af

Please sign in to comment.