Howard windows updates (#2953)

* update my win conda config * we need <stdexcept> * cast away some silly warnings * ignore conversion warnings in e57 library on windows * condition e57 ignoration
PDAL · Mar 13, 2020 · bafded2 · bafded2
1 parent 2c5435b
commit bafded2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/filters/StatsFilter.hpp b/filters/StatsFilter.hpp
@@ -89,7 +89,7 @@ typedef std::vector<double> DataVector;
     {
         if (M2 == 0 || m_cnt <= 2 || !m_advanced)
             return 0.0;
-        double c(m_cnt);
+        double c((double)m_cnt);
         return populationSkewness() * std::sqrt(c) * std::sqrt(c - 1) / (c - 2);
     }
     double skewness() const
@@ -112,14 +112,14 @@ typedef std::vector<double> DataVector;
     {
         if (M2 == 0 || m_cnt <= 3 || !m_advanced)
             return 0;
-        double c(m_cnt);
+        double c((double)m_cnt);
         return populationKurtosis() * (c + 1) * (c - 1) / ((c - 2) * (c - 3));
     }
     double sampleExcessKurtosis() const
     {
         if (M2 == 0 || m_cnt <= 3 || !m_advanced)
             return 0;
-        double c(m_cnt);
+        double c((double)m_cnt);
         return sampleKurtosis() - 3 * (c - 1) * (c - 1) / ((c - 2) * (c - 3));
     }
     double kurtosis() const

diff --git a/plugins/e57/libE57Format/CMakeLists.txt b/plugins/e57/libE57Format/CMakeLists.txt
@@ -73,6 +73,11 @@ add_library(E57Format STATIC
     contrib/CRCpp/inc/CRC.h
 )
 pdal_target_compile_settings(E57Format)
+if (WIN32)
+target_compile_options(E57Format PRIVATE
+    /wd4244
+    )
+endif()
 target_link_libraries(E57Format
     PUBLIC
         ${XercesC_LIBRARIES}

diff --git a/plugins/icebridge/io/Hdf5Handler.hpp b/plugins/icebridge/io/Hdf5Handler.hpp
@@ -41,6 +41,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <stdexcept>
 
 namespace pdal
 {

diff --git a/scripts/conda/win64.bat b/scripts/conda/win64.bat
@@ -16,12 +16,11 @@ cmake -G %GENERATOR% ^
       -DBUILD_PLUGIN_PYTHON=ON ^
 	  -DPython3_ROOT_DIR:FILEPATH="%CONDA_PREFIX%" ^
 	  -DPython3_FIND_STRATEGY=LOCATION ^
-  	  -DFBX_ROOT_DIR:FILEPATH="C:\fbx\2019.0" ^
       -DBUILD_PLUGIN_OCI=OFF ^
       -DBUILD_PLUGIN_I3S=ON ^
 	  -DBUILD_PLUGIN_E57=ON ^
 	  -DBUILD_PLUGIN_TILEDB=ON ^
-      -DBUILD_PLUGIN_FBX=ON ^
+      -DBUILD_PLUGIN_FBX=OFF ^
       -DBUILD_PLUGIN_ICEBRIDGE=ON ^
       -DBUILD_PLUGIN_NITF=ON ^
       -DBUILD_PLUGIN_TILEDB=ON ^
@@ -39,7 +38,7 @@ cmake -G %GENERATOR% ^
       -DWITH_LZMA=ON ^
       -DLIBLZMA_LIBRARY:FILEPATH=%CONDA_PREFIX%\Library\lib\liblzma.lib ^
       -DZSTD_LIBRARY:FILEPATH=%CONDA_PREFIX%\Library\lib\libzstd.lib ^
-	  -DBUILD_PLUGIN_RDBLIB=ON ^
+	  -DBUILD_PLUGIN_RDBLIB=OFF ^
 	  -DRdb_ROOT=..\..\..\..\rdblib-2.2.1-x86_64-windows\interface\cpp ^
       .. --debug-trycompile