Repository: arrow Updated Branches: refs/heads/master 4598c1a36 -> 5e279f0a7
ARROW-569: [C++] Set version for *.pc *.pc.in such as cpp/build/arrow.pc.in refers ARROW_VERSION but it isn't defined. Author: Kouhei Sutou <[email protected]> Closes #344 from kou/arrow-569-c++-set-version-for-pc and squashes the following commits: 48b366b [Kouhei Sutou] ARROW-569: [C++] Set version for *.pc Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/5e279f0a Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/5e279f0a Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/5e279f0a Branch: refs/heads/master Commit: 5e279f0a73842518caf34c2cda7c941548d55dbf Parents: 4598c1a Author: Kouhei Sutou <[email protected]> Authored: Tue Feb 21 14:44:01 2017 +0100 Committer: Uwe L. Korn <[email protected]> Committed: Tue Feb 21 14:44:01 2017 +0100 ---------------------------------------------------------------------- cpp/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/5e279f0a/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 035cd8f..0888a8b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -18,6 +18,12 @@ cmake_minimum_required(VERSION 2.7) project(arrow) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../java/pom.xml" POM_XML) +string(REGEX MATCHALL + "\n <version>[^<]+</version>" ARROW_VERSION_TAG "${POM_XML}") +string(REGEX REPLACE + "(\n <version>|</version>)" "" ARROW_VERSION "${ARROW_VERSION_TAG}") + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") include(CMakeParseArguments)
