xdmf3 2016-07-12 (86113671)

Code extracted from:

    git://xdmf.org/Xdmf.git

at commit 86113671eaa9582f0e24d01bd4160a46d8e94c5b (master).

CMakeLists.txt

@@ -192,7 +192,7 @@ if(XDMF_WRAP_PYTHON)
         PARENT_SCOPE)
     endif()
 
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${python_name}.py
+    install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${python_name}.py
       DESTINATION lib/python)
     install(TARGETS ${SWIG_MODULE_${python_name}Python_REAL_NAME}
       DESTINATION lib/python)

XdmfCurvilinearGrid.hpp

@@ -221,6 +221,7 @@ public:
    * @return    The geometry associated with this grid.
    */
   shared_ptr<XdmfGeometry> getGeometry();
+  using XdmfGrid::getGeometry;
 
   virtual void read();
 

XdmfUnstructuredGrid.hpp

@@ -124,6 +124,7 @@ public:
    * @return    The geometry associated with this grid.
    */
   shared_ptr<XdmfGeometry> getGeometry();
+  using XdmfGrid::getGeometry;
 
   virtual std::string getItemTag() const;
 
@@ -155,6 +156,7 @@ public:
    * @return    The topology associated with this grid.
    */
   shared_ptr<XdmfTopology> getTopology();
+  using XdmfGrid::getTopology;
 
   virtual void read();
 

core/CMakeLists.txt

@@ -236,6 +236,11 @@ file(GLOB_RECURSE
   "*.hpp" "*.tpp" "*.i"
   "../CMake/VersionSuite/*.hpp")
 file(GLOB LokiHeaders loki/*.h)
+
+set(XdmfCoreHeaders
+      ${XdmfCoreHeaders}
+      ${CMAKE_CURRENT_BINARY_DIR}/XdmfCoreConfig.hpp)
+
 install(FILES ${XdmfCoreHeaders} DESTINATION include)
 install(FILES ${LokiHeaders} DESTINATION include/loki)
 install(TARGETS XdmfCore

core/XdmfCoreReader.cpp

@@ -231,7 +231,9 @@ public:
                 }
               }
               if(!whitespace) {
-                itemProperties.insert(std::make_pair("Content", content));
+                std::string contentString(content);
+                boost::algorithm::trim(contentString);
+                itemProperties.insert(std::make_pair("Content", contentString));
                 itemProperties.insert(std::make_pair("XMLDir", mXMLDir));
                 break;
               }