Moved ValueConversion.h and VolumeSampler.h to the public API. Fixed includes...

Moved ValueConversion.h and VolumeSampler.h to the public API. Fixed includes and list of headers to install.

src/CMakeLists.txt

@@ -66,26 +66,27 @@ set (PRIVATE_HEADER_FILES
   VDS/FSE/mem.h
   VDS/FSE/fse.h
   VDS/Rle.h
-  VDS/ValueConversion.h
-  VDS/VolumeSampler.h
   VDS/VolumeDataRequestProcessor.h
   VDS/ThreadPool.h
   )
 
 set (EXPORTED_HEADER_FILES
-  OpenVDS/OpenVDS.h
+  OpenVDS/GlobalMetadataCommon.h
   OpenVDS/KnownMetadata.h
   OpenVDS/Metadata.h
+  OpenVDS/OpenVDS.h
+  OpenVDS/openvds_export.h
+  OpenVDS/Range.h
+  OpenVDS/ValueConversion.h
+  OpenVDS/Vector.h
   OpenVDS/VolumeData.h
-  OpenVDS/VolumeDataLayoutDescriptor.h
-  OpenVDS/VolumeDataChannelDescriptor.h
-  OpenVDS/VolumeDataAxisDescriptor.h
   OpenVDS/VolumeDataAccess.h
+  OpenVDS/VolumeDataAxisDescriptor.h
+  OpenVDS/VolumeDataChannelDescriptor.h
   OpenVDS/VolumeDataLayout.h
-  OpenVDS/Vector.h
-  OpenVDS/Range.h
-  OpenVDS/openvds_export.h)
-
+  OpenVDS/VolumeDataLayoutDescriptor.h
+  OpenVDS/VolumeSampler.h
+  )
 
 add_library(openvds_objects OBJECT
   ${PRIVATE_HEADER_FILES}

src/OpenVDS.cpp

@@ -15,11 +15,11 @@
 ** limitations under the License.
 ****************************************************************************/
 
-#include "OpenVDS/OpenVDS.h"
+#include <OpenVDS/OpenVDS.h>
 
-#include <VDS/VDS.h>
+#include "VDS/VDS.h"
 
-#include <VDS/ParseVDSJson.h>
+#include "VDS/ParseVDSJson.h"
 
 #include <memory>
 

src/VDS/VolumeDataAccessManagerImpl.cpp

@@ -20,8 +20,8 @@
 
 #include "VDS.h"
 #include "VolumeDataPageAccessorImpl.h"
-#include "ValueConversion.h"
-#include "VolumeSampler.h"
+#include <OpenVDS/ValueConversion.h>
+#include <OpenVDS/VolumeSampler.h>
 #include "ParseVDSJson.h"
 #include "VolumeDataStore.h"
 #include "VolumeDataHash.h"

src/VDS/VolumeDataAccessor.cpp

@@ -22,7 +22,7 @@
 #include "VolumeDataRequestProcessor.h"
 #include "DataBlock.h"
 #include "DimensionGroup.h"
-#include "ValueConversion.h"
+#include <OpenVDS/ValueConversion.h>
 
 #include <inttypes.h>
 

src/VDS/VolumeDataAccessor.h

@@ -22,7 +22,7 @@
 
 #include "VolumeDataPageImpl.h"
 #include "VolumeDataPageAccessorImpl.h"
-#include "VolumeSampler.h"
+#include <OpenVDS/VolumeSampler.h>
 
 
 namespace OpenVDS

src/VDS/VolumeDataStore.cpp

@@ -23,7 +23,7 @@
 #include "VolumeDataHash.h"
 #include "Rle.h"
 #include "DataBlock.h"
-#include "ValueConversion.h"
+#include <OpenVDS/ValueConversion.h>
 
 
 #include <stdlib.h>