Repository: parquet-cpp Updated Branches: refs/heads/master bc46b1436 -> adb316896
PARQUET-1088: Remove parquet_version.h from version control since it gets auto generated @wesm Thanks for the tip on fixing this. Author: Deepak Majeti <[email protected]> Closes #388 from majetideepak/PARQUET-1088 and squashes the following commits: 32915c6 [Deepak Majeti] add parquet_version.h to gitignore 48be6e2 [Deepak Majeti] Fix CMAKE arguments Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/adb31689 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/adb31689 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/adb31689 Branch: refs/heads/master Commit: adb3168962d9915ea23413b1dc9f9699c58a6967 Parents: bc46b14 Author: Deepak Majeti <[email protected]> Authored: Wed Sep 6 09:30:37 2017 +0200 Committer: Uwe L. Korn <[email protected]> Committed: Wed Sep 6 09:30:37 2017 +0200 ---------------------------------------------------------------------- .gitignore | 2 ++ src/parquet/CMakeLists.txt | 4 ++-- src/parquet/parquet_version.h | 24 ------------------------ 3 files changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/adb31689/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 3730dba..bd21a16 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ Makefile thirdparty +parquet_version.h + *.pc .idea/ *-build/ http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/adb31689/src/parquet/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/parquet/CMakeLists.txt b/src/parquet/CMakeLists.txt index 09a689e..a2e283e 100644 --- a/src/parquet/CMakeLists.txt +++ b/src/parquet/CMakeLists.txt @@ -30,11 +30,11 @@ install(FILES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/parquet") configure_file(parquet_version.h.in - "${CMAKE_CURRENT_BINARY_DIR}/parquet_version.h" + "${CMAKE_CURRENT_SOURCE_DIR}/parquet_version.h" @ONLY) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/parquet_version.h" + "${CMAKE_CURRENT_SOURCE_DIR}/parquet_version.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/parquet") # pkg-config support http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/adb31689/src/parquet/parquet_version.h ---------------------------------------------------------------------- diff --git a/src/parquet/parquet_version.h b/src/parquet/parquet_version.h deleted file mode 100644 index 5432333..0000000 --- a/src/parquet/parquet_version.h +++ /dev/null @@ -1,24 +0,0 @@ -// 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. - -#ifndef PARQUET_VERSION_H -#define PARQUET_VERSION_H - -// define the parquet created by version -#define CREATED_BY_VERSION "parquet-cpp version 1.1.1-SNAPSHOT" - -#endif // PARQUET_VERSION_H
