You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@orc.apache.org by om...@apache.org on 2019/06/21 19:53:08 UTC

[orc] 01/02: ORC-366: Improve TZDIR setup for WIN32

This is an automated email from the ASF dual-hosted git repository.

omalley pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git

commit 41f5f713066e6354c8839978a750de3574ad3338
Author: rip-nsk <ri...@gmail.com>
AuthorDate: Wed May 16 13:10:43 2018 -0700

    ORC-366: Improve TZDIR setup for WIN32
    
    Fixes #271
    
    Signed-off-by: Owen O'Malley <om...@apache.org>
---
 appveyor.yml                            | 4 ----
 cmake_modules/ThirdpartyToolchain.cmake | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

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%
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 6e7ca98..f8584c0 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -176,6 +176,8 @@ if (WIN32)
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND "")
+  ExternalProject_Get_Property(tzdata_ep SOURCE_DIR)
+  set(TZDATA_DIR ${SOURCE_DIR}/share/zoneinfo)
 endif ()
 
 # ----------------------------------------------------------------------