From commits-return-1451-apmail-orc-commits-archive=orc.apache.org@orc.apache.org Tue May 22 15:55:33 2018 Return-Path: X-Original-To: apmail-orc-commits-archive@minotaur.apache.org Delivered-To: apmail-orc-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FE6718266 for ; Tue, 22 May 2018 15:55:33 +0000 (UTC) Received: (qmail 73638 invoked by uid 500); 22 May 2018 15:55:33 -0000 Delivered-To: apmail-orc-commits-archive@orc.apache.org Received: (qmail 73614 invoked by uid 500); 22 May 2018 15:55:33 -0000 Mailing-List: contact commits-help@orc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@orc.apache.org Delivered-To: mailing list commits@orc.apache.org Received: (qmail 73605 invoked by uid 99); 22 May 2018 15:55:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2018 15:55:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F256E1087; Tue, 22 May 2018 15:55:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: omalley@apache.org To: commits@orc.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: orc git commit: ORC-366: Improve TZDIR setup for WIN32 Date: Tue, 22 May 2018 15:55:33 +0000 (UTC) Repository: orc Updated Branches: refs/heads/master 19736f515 -> 5120baaef ORC-366: Improve TZDIR setup for WIN32 Fixes #271 Signed-off-by: Owen O'Malley Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/5120baae Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/5120baae Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/5120baae Branch: refs/heads/master Commit: 5120baaef599f48556c9898c3b10ba3a89933f85 Parents: 19736f5 Author: rip-nsk Authored: Wed May 16 13:10:43 2018 -0700 Committer: Owen O'Malley Committed: Tue May 22 08:55:19 2018 -0700 ---------------------------------------------------------------------- appveyor.yml | 4 ---- c++/test/CMakeLists.txt | 8 ++++++++ cmake_modules/ThirdpartyToolchain.cmake | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/5120baae/appveyor.yml ---------------------------------------------------------------------- diff --git a/appveyor.yml b/appveyor.yml index ddb66e9..dc09236 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,9 +15,6 @@ # specific language governing permissions and limitations # under the License. -# Operating system (build VM template) -# os: Visual Studio 2017 - environment: matrix: - JOB: Visual Studio 2015 @@ -40,6 +37,5 @@ build_script: -DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF - - set TZDIR=C:/projects/orc/build/tzdata_ep-prefix/src/tzdata_ep/share/zoneinfo - cmake --build . --config %CONFIGURATION% - ctest -VV -C %CONFIGURATION% http://git-wip-us.apache.org/repos/asf/orc/blob/5120baae/c++/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt index 83ce8f8..8e7c878 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -65,3 +65,11 @@ target_link_libraries (create-test-files ) add_test (NAME orc-test COMMAND orc-test) + +if (WIN32) + set_property( + TEST orc-test + PROPERTY + ENVIRONMENT "TZDIR=${TZDATA_DIR}" + ) +endif () http://git-wip-us.apache.org/repos/asf/orc/blob/5120baae/cmake_modules/ThirdpartyToolchain.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake index 7309826..3db4a5f 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake @@ -175,6 +175,8 @@ if (WIN32) CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "") + ExternalProject_Get_Property(tzdata_ep SOURCE_DIR) + set(TZDATA_DIR ${SOURCE_DIR}/share/zoneinfo) endif () # ----------------------------------------------------------------------