Repository: thrift Updated Branches: refs/heads/master 211b82de1 -> 74d503e0e
THRIFT-2850 CMake for Apache Thrift Change project name to "Apache Thrift" and add test/py fix: add missing test/py/CMakeLists.txt and update package name Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/74d503e0 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/74d503e0 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/74d503e0 Branch: refs/heads/master Commit: 74d503e0eb1968ddc70bd110223e734838db9bd6 Parents: 211b82d Author: Roger Meier <[email protected]> Authored: Fri Jun 5 07:10:19 2015 +0200 Committer: Roger Meier <[email protected]> Committed: Fri Jun 5 07:10:19 2015 +0200 ---------------------------------------------------------------------- build/cmake/CPackConfig.cmake | 2 +- test/py/CMakeLists.txt | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/74d503e0/build/cmake/CPackConfig.cmake ---------------------------------------------------------------------- diff --git a/build/cmake/CPackConfig.cmake b/build/cmake/CPackConfig.cmake index 0941a80..0240005 100644 --- a/build/cmake/CPackConfig.cmake +++ b/build/cmake/CPackConfig.cmake @@ -25,7 +25,7 @@ # http://www.cmake.org/Wiki/CMake:CPackConfiguration ### general settings -set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") +set(CPACK_PACKAGE_NAME "thrift") set(CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Thrift") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") http://git-wip-us.apache.org/repos/asf/thrift/blob/74d503e0/test/py/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/test/py/CMakeLists.txt b/test/py/CMakeLists.txt new file mode 100755 index 0000000..6c907bf --- /dev/null +++ b/test/py/CMakeLists.txt @@ -0,0 +1,48 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +add_test(NAME python_test + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/RunClientServer.py + DEPENDS gen-py-default/ThriftTest/ThriftTest.py + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_custom_command(OUTPUT gen-py-default/ThriftTest/ThriftTest.py + COMMAND thrift-compiler --gen gen-py-default -out gen-py-default ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift +) + +add_custom_command(OUTPUT gen-py-slots/ThriftTest/ThriftTest.py + COMMAND thrift-compiler --gen py:slots -out gen-py-slots ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift +) + +add_custom_command(OUTPUT gen-py-newstyle/ThriftTest/ThriftTest.py + COMMAND thrift-compiler --gen py:new_style -out gen-py-newstyle ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift +) + +add_custom_command(OUTPUT gen-py-newstyleslots/ThriftTest/ThriftTest.py + COMMAND thrift-compiler --gen py:new_style,slots -out gen-py-newstyleslots ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift +) + +add_custom_command(OUTPUT gen-py-dynamic/ThriftTest/ThriftTest.py + COMMAND thrift-compiler --gen py:dynamic -out gen-py-dynamic ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift +) + +add_custom_command(OUTPUT gen-py-dynamicslots/ThriftTest/ThriftTest.py + COMMAND thrift-compiler --gen py:dynamic,slots -out gen-py-dynamicslots ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift +)
