Merge remote-tracking branch 'origin/master'

PDAL · Jul 17, 2019 · fe59686 · fe59686
2 parents 26a1e10 + 7e892a8
commit fe59686
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in
@@ -17,11 +17,6 @@ endforeach(_dir)
 
 include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake")
 
-if (WIN32)
-# On windows link in pdal_util as well
-  set(PDAL_LIBRARIES "@PDAL_LIB_NAME@" "@PDAL_UTIL_LIB_NAME@")
-else (WIN32)
-  set(PDAL_LIBRARIES "@PDAL_LIB_NAME@")
-endif(WIN32)
+set(PDAL_LIBRARIES @PDAL_BASE_LIB_NAME@ @PDAL_UTIL_LIB_NAME@) 
 
 check_required_components(PDAL)
diff --git a/plugins/e57/io/E57Writer.cpp b/plugins/e57/io/E57Writer.cpp
@@ -240,8 +240,8 @@ void E57Writer::setupFileHeader()
     e57::ustring libraryId;
     e57::Utilities::getVersions(astmMajor, astmMinor, libraryId);
 
-    m_rootNode->set("majorVersion", e57::IntegerNode(*m_imageFile, astmMajor));
-    m_rootNode->set("minorVersion", e57::IntegerNode(*m_imageFile, astmMinor));
+    m_rootNode->set("versionMajor", e57::IntegerNode(*m_imageFile, astmMajor));
+    m_rootNode->set("versionMinor", e57::IntegerNode(*m_imageFile, astmMinor));
     m_rootNode->set("e57LibraryVersion", e57::StringNode(*m_imageFile, libraryId));
 
     // Save a dummy string for coordinate system.