diff options
| author | Jens Geyer <jensg@apache.org> | 2019-10-19 21:22:59 +0200 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2019-10-20 16:20:57 +0200 |
| commit | 7199741f440ef7de15e13755ea2371157c8cd298 (patch) | |
| tree | 760ba3ff7a69d96dd6b05214e18c2d0ddc51ec06 /compiler/cpp/tests | |
| parent | 616df98f00a594f133466aa7f94930c1bf85b24a (diff) | |
| download | thrift-7199741f440ef7de15e13755ea2371157c8cd298.tar.gz | |
THRIFT-4938 Issues with version.h treatment
Client: Compiler
Patch: Jens Geyer
This closes #1902
Diffstat (limited to 'compiler/cpp/tests')
| -rw-r--r-- | compiler/cpp/tests/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/cpp/tests/CMakeLists.txt b/compiler/cpp/tests/CMakeLists.txt index fde9073ca..91cc35dbf 100644 --- a/compiler/cpp/tests/CMakeLists.txt +++ b/compiler/cpp/tests/CMakeLists.txt @@ -27,7 +27,8 @@ set(THRIFT_COMPILER_SOURCE_DIR # don't generate ZERO_CHECK set(CMAKE_SUPPRESS_REGENERATION true) -configure_file(${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h) +# version.h now handled via veralign.sh +#configure_file(${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h) if(MSVC) # The winflexbison generator outputs some macros that conflict with the Visual Studio 2010 copy of stdint.h # This might be fixed in later versions of Visual Studio, but an easy solution is to include stdint.h first @@ -77,7 +78,7 @@ set(thrift_compiler_SOURCES ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/generate/t_generator.cc ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/parse/t_typedef.cc ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/parse/parse.cc - ${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h + ${THRIFT_COMPILER_SOURCE_DIR}/thrift/version.h ) # This macro adds an option THRIFT_COMPILER_${NAME} |