Enable URI spectrum file format for macOS and Linux

Author: wcjohns

bindings/python/CMakeLists.txt

@@ -6,13 +6,19 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 set( SpecUtils_ENABLE_D3_CHART ON CACHE BOOL "" )
 set( SpecUtils_D3_SUPPORT_FILE_STATIC ON CACHE BOOL "" )
-set( SpecUtils_ENABLE_URI_SPECTRA OFF CACHE BOOL "" )  #Lets not worry about linking to zlib right now
 set( SpecUtils_PYTHON_BINDINGS ON CACHE BOOL "Build the python bindings" )
 set( SpecUtils_ENABLE_EQUALITY_CHECKS OFF CACHE BOOL "" )
 set( PERFORM_DEVELOPER_CHECKS OFF CACHE BOOL "" )
 set( SpecUtils_SHARED_LIB OFF CACHE BOOL "" )  #we'll statically link SpecUtils into the lib we create here
 set( SpecUtils_FLT_PARSE_METHOD "strtod" CACHE STRING "Float parsing method" )
 
+# Enable URI spectra for macOS and Linux (since we are already linking to zlib), but not Windows
+if(WIN32)
+  set( SpecUtils_ENABLE_URI_SPECTRA OFF CACHE BOOL "" )
+else()
+  set( SpecUtils_ENABLE_URI_SPECTRA ON CACHE BOOL "" )
+endif()
+
 add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_BINARY_DIR}/LibSpecUtils )
 
 if (NOT SKBUILD)

bindings/python/SpecFile_py.cpp

@@ -1354,6 +1354,9 @@ NB_MODULE(SpecUtils, m) {
   .value("ScanDataXml", SpecUtils::ParserType::ScanDataXml)
   .value("Json", SpecUtils::ParserType::Json)
   .value("CaenHexagonGXml", SpecUtils::ParserType::CaenHexagonGXml)
+  #if( SpecUtils_ENABLE_URI_SPECTRA )
+  .value("Uri", SpecUtils::ParserType::Uri)
+#endif
   .value("Auto", SpecUtils::ParserType::Auto);
 
 

bindings/python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "SandiaSpecUtils"
-version = "0.0.6"
+version = "0.0.7"
 description = "Python bindings for SpecUtils using nanobind and scikit-build"
 readme = "README.md"
 requires-python = ">=3.9"