commit | a0bf238b09ed2ade243fef24a7a11653607ffe89 | [log] [tgz] |
---|---|---|
author | Wouter van Oortmerssen <wvo@google.com> | Mon May 04 21:00:43 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 04 21:00:43 2015 +0000 |
tree | 064bec507ed60016983834d02458854f5b89f6c1 | |
parent | fc7e8af55e8a42d70ca098361a64710294f714f9 [diff] | |
parent | 37e6efe1f97b0788bd457d61e52ed40e12d2e69a [diff] |
Merge changes I2de7d14d,I56392340 into ub-games-master * changes: Added accessor for file_extension in generated code. Added missing --gen-mutable to CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32287ea..39e65fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ add_executable(flatc ${FlatBuffers_Compiler_SRCS}) endif() -if(FLATBUFFERS_BUILD_FLATC) +if(FLATBUFFERS_BUILD_FLATHASH) add_executable(flathash ${FlatHash_SRCS}) endif()