ORC-366: Improve TZDIR setup for WIN32

Fixes apache#271

Signed-off-by: Owen O'Malley <[email protected]>

Author: rip-nsk

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%

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 ()

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 ()
 
 # ----------------------------------------------------------------------