@cpp.js/package-gdal 1.0.0-beta.23 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/README.md +1 -1
  3. package/dist/prebuilt/Android-arm64-v8a/include/gdal_version.h +3 -3
  4. package/dist/prebuilt/Android-arm64-v8a/include/ogr_api.h +4 -4
  5. package/dist/prebuilt/Android-arm64-v8a/include/ogr_feature.h +2 -2
  6. package/dist/prebuilt/Android-arm64-v8a/lib/cmake/gdal/GDALConfigVersion.cmake +3 -3
  7. package/dist/prebuilt/Android-arm64-v8a/lib/libgdal.so +0 -0
  8. package/dist/prebuilt/Android-arm64-v8a/lib/pkgconfig/gdal.pc +1 -1
  9. package/dist/prebuilt/Android-arm64-v8a/share/gdal/gdalvrt.xsd +30 -24
  10. package/dist/prebuilt/Android-x86_64/include/gdal_version.h +3 -3
  11. package/dist/prebuilt/Android-x86_64/include/ogr_api.h +4 -4
  12. package/dist/prebuilt/Android-x86_64/include/ogr_feature.h +2 -2
  13. package/dist/prebuilt/Android-x86_64/lib/cmake/gdal/GDALConfigVersion.cmake +3 -3
  14. package/dist/prebuilt/Android-x86_64/lib/libgdal.so +0 -0
  15. package/dist/prebuilt/Android-x86_64/lib/pkgconfig/gdal.pc +1 -1
  16. package/dist/prebuilt/Android-x86_64/share/gdal/gdalvrt.xsd +30 -24
  17. package/dist/prebuilt/Emscripten-x86_64/include/gdal_version.h +3 -3
  18. package/dist/prebuilt/Emscripten-x86_64/include/ogr_api.h +4 -4
  19. package/dist/prebuilt/Emscripten-x86_64/include/ogr_feature.h +2 -2
  20. package/dist/prebuilt/Emscripten-x86_64/lib/cmake/gdal/GDALConfigVersion.cmake +3 -3
  21. package/dist/prebuilt/Emscripten-x86_64/lib/cmake/gdal/thirdparty/FindDotnet.cmake +33 -36
  22. package/dist/prebuilt/Emscripten-x86_64/lib/libgdal.a +0 -0
  23. package/dist/prebuilt/Emscripten-x86_64/lib/pkgconfig/gdal.pc +1 -1
  24. package/dist/prebuilt/Emscripten-x86_64/share/gdal/gdalvrt.xsd +30 -24
  25. package/dist/prebuilt/iOS-iphoneos/include/gdal_version.h +3 -3
  26. package/dist/prebuilt/iOS-iphoneos/include/ogr_api.h +4 -4
  27. package/dist/prebuilt/iOS-iphoneos/include/ogr_feature.h +2 -2
  28. package/dist/prebuilt/iOS-iphoneos/share/gdal/gdalvrt.xsd +30 -24
  29. package/dist/prebuilt/iOS-iphonesimulator/include/gdal_version.h +3 -3
  30. package/dist/prebuilt/iOS-iphonesimulator/include/ogr_api.h +4 -4
  31. package/dist/prebuilt/iOS-iphonesimulator/include/ogr_feature.h +2 -2
  32. package/dist/prebuilt/iOS-iphonesimulator/share/gdal/gdalvrt.xsd +30 -24
  33. package/gdal.xcframework/ios-arm64_arm64e/Headers/gdal_version.h +3 -3
  34. package/gdal.xcframework/ios-arm64_arm64e/Headers/ogr_api.h +4 -4
  35. package/gdal.xcframework/ios-arm64_arm64e/Headers/ogr_feature.h +2 -2
  36. package/gdal.xcframework/ios-arm64_arm64e/libgdal.a +0 -0
  37. package/gdal.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/gdal_version.h +3 -3
  38. package/gdal.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/ogr_api.h +4 -4
  39. package/gdal.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/ogr_feature.h +2 -2
  40. package/gdal.xcframework/ios-arm64_arm64e_x86_64-simulator/libgdal.a +0 -0
  41. package/package.json +13 -13
  42. package/dist/prebuilt/Emscripten-x86_64/lib/cmake/gdal/packages/FindDB2.cmake +0 -103
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @cpp.js/package-gdal
2
2
 
3
+ ## 1.0.0
4
+
5
+ ### Major Changes
6
+
7
+ - 🚀 first stable release
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies
12
+ - @cpp.js/package-expat@1.0.0
13
+ - @cpp.js/package-geos@1.0.0
14
+ - @cpp.js/package-geotiff@1.0.0
15
+ - @cpp.js/package-iconv@1.0.0
16
+ - @cpp.js/package-proj@1.0.0
17
+ - @cpp.js/package-spatialite@1.0.0
18
+ - @cpp.js/package-sqlite3@1.0.0
19
+ - @cpp.js/package-tiff@1.0.0
20
+ - @cpp.js/package-webp@1.0.0
21
+ - @cpp.js/package-zlib@1.0.0
22
+
3
23
  ## 1.0.0-beta.23
4
24
 
5
25
  ### Patch Changes
package/README.md CHANGED
@@ -47,4 +47,4 @@ std::string Native::sample() {
47
47
  ## License
48
48
  This project includes the precompiled GDAL library, which is distributed under the [MIT License](https://github.com/OSGeo/gdal/blob/master/LICENSE.TXT).
49
49
 
50
- GDAL Homepage: <https://gdal.org/>
50
+ GDAL Homepage: [https://gdal.org/](https://gdal.org/)
@@ -8,7 +8,7 @@
8
8
  #ifndef GDAL_VERSION_MAJOR
9
9
  # define GDAL_VERSION_MAJOR 3
10
10
  # define GDAL_VERSION_MINOR 10
11
- # define GDAL_VERSION_REV 0
11
+ # define GDAL_VERSION_REV 1
12
12
  # define GDAL_VERSION_BUILD 0
13
13
  #endif
14
14
 
@@ -25,9 +25,9 @@
25
25
 
26
26
  #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
27
27
  #ifndef GDAL_RELEASE_DATE
28
- # define GDAL_RELEASE_DATE 20241101
28
+ # define GDAL_RELEASE_DATE 20250108
29
29
  #endif
30
30
  #ifndef GDAL_RELEASE_NAME
31
- # define GDAL_RELEASE_NAME "3.10.0"
31
+ # define GDAL_RELEASE_NAME "3.10.1"
32
32
  #endif
33
33
  #endif
@@ -727,7 +727,7 @@ OGRFeatureH CPL_DLL OGR_L_GetNextFeature(OGRLayerH) CPL_WARN_UNUSED_RESULT;
727
727
  /** Conveniency macro to iterate over features of a layer.
728
728
  *
729
729
  * Typical usage is:
730
- * <pre>
730
+ * \code{.cpp}
731
731
  * OGR_FOR_EACH_FEATURE_BEGIN(hFeat, hLayer)
732
732
  * {
733
733
  * // Do something, including continue, break;
@@ -735,14 +735,14 @@ OGRFeatureH CPL_DLL OGR_L_GetNextFeature(OGRLayerH) CPL_WARN_UNUSED_RESULT;
735
735
  * // outside of the loop, in which case use OGR_F_Destroy(hFeat))
736
736
  * }
737
737
  * OGR_FOR_EACH_FEATURE_END(hFeat)
738
- * </pre>
738
+ * \endcode
739
739
  *
740
740
  * In C++, you might want to use instead range-based loop:
741
- * <pre>
741
+ * \code{.cpp}
742
742
  * for( auto&& poFeature: poLayer )
743
743
  * {
744
744
  * }
745
- * </pre>
745
+ * \endcode
746
746
  *
747
747
  * @param hFeat variable name for OGRFeatureH. The variable will be declared
748
748
  * inside the macro body.
@@ -1136,13 +1136,13 @@ class CPL_DLL OGRFeature
1136
1136
  * (dereference) more than one iterator step at a time, since you will get
1137
1137
  * a reference to the same object (FieldValue) at each iteration step.
1138
1138
  *
1139
- * <pre>
1139
+ * \code{.cpp}
1140
1140
  * for( auto&& oField: poFeature )
1141
1141
  * {
1142
1142
  * std::cout << oField.GetIndex() << "," << oField.GetName()<< ": " <<
1143
1143
  * oField.GetAsString() << std::endl;
1144
1144
  * }
1145
- * </pre>
1145
+ * \endcode
1146
1146
  *
1147
1147
  * @since GDAL 2.3
1148
1148
  */
@@ -10,13 +10,13 @@
10
10
  # The variable CVF_VERSION must be set before calling configure_file().
11
11
 
12
12
 
13
- set(PACKAGE_VERSION "3.10.0")
13
+ set(PACKAGE_VERSION "3.10.1")
14
14
 
15
15
  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
16
16
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
17
17
  else()
18
18
 
19
- if("3.10.0" MATCHES "^([0-9]+)\\.([0-9]+)")
19
+ if("3.10.1" MATCHES "^([0-9]+)\\.([0-9]+)")
20
20
  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
21
21
  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
22
22
 
@@ -27,7 +27,7 @@ else()
27
27
  string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
28
28
  endif()
29
29
  else()
30
- set(CVF_VERSION_MAJOR "3.10.0")
30
+ set(CVF_VERSION_MAJOR "3.10.1")
31
31
  set(CVF_VERSION_MINOR "")
32
32
  endif()
33
33
 
@@ -1,4 +1,4 @@
1
- CONFIG_VERSION=3.10.0
1
+ CONFIG_VERSION=3.10.1
2
2
  CONFIG_INST_PREFIX=/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-arm64-v8a
3
3
  CONFIG_INST_LIBS=-L/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-arm64-v8a/lib -lgdal
4
4
  CONFIG_INST_CFLAGS=-I/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-arm64-v8a/include
@@ -635,35 +635,41 @@
635
635
  </xs:complexType>
636
636
 
637
637
  <xs:complexType name="ArrayType">
638
- <xs:sequence>
639
- <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
640
- <xs:sequence>
641
- <xs:choice minOccurs="0" maxOccurs="unbounded">
642
- <xs:element name="Dimension" type="DimensionType"/>
643
- <xs:element name="DimensionRef" type="DimensionRefType"/>
644
- </xs:choice>
645
- </xs:sequence>
646
- <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
647
- <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
648
- <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
649
- <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
650
- <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
651
- <xs:choice>
652
- <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
638
+ <xs:complexContent>
639
+ <xs:extension base="AbstractArrayType">
653
640
  <xs:sequence>
654
- <xs:choice minOccurs="0" maxOccurs="unbounded">
655
- <xs:element name="ConstantValue" type="ConstantValueType"/>
656
- <xs:element name="InlineValues" type="InlineValuesType"/>
657
- <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
658
- <xs:element name="Source" type="SourceType"/>
641
+ <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
642
+ <xs:sequence>
643
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
644
+ <xs:element name="Dimension" type="DimensionType"/>
645
+ <xs:element name="DimensionRef" type="DimensionRefType"/>
646
+ </xs:choice>
647
+ </xs:sequence>
648
+ <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
649
+ <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
650
+ <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
651
+ <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
652
+ <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
653
+ <xs:choice>
654
+ <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
655
+ <xs:sequence>
656
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
657
+ <xs:element name="ConstantValue" type="ConstantValueType"/>
658
+ <xs:element name="InlineValues" type="InlineValuesType"/>
659
+ <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
660
+ <xs:element name="Source" type="SourceType"/>
661
+ </xs:choice>
662
+ </xs:sequence>
659
663
  </xs:choice>
664
+ <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
660
665
  </xs:sequence>
661
- </xs:choice>
662
- <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
663
- </xs:sequence>
664
- <xs:attribute name="name" type="xs:string" use="required"/>
666
+ <xs:attribute name="name" type="xs:string" use="required"/>
667
+ </xs:extension>
668
+ </xs:complexContent>
665
669
  </xs:complexType>
666
670
 
671
+ <xs:element name="Array" substitutionGroup="AbstractArray" type="ArrayType"/>
672
+
667
673
  <xs:complexType name="RegularlySpacedValuesType">
668
674
  <xs:attribute name="start" type="xs:double" use="required"/>
669
675
  <xs:attribute name="increment" type="xs:double" use="required"/>
@@ -8,7 +8,7 @@
8
8
  #ifndef GDAL_VERSION_MAJOR
9
9
  # define GDAL_VERSION_MAJOR 3
10
10
  # define GDAL_VERSION_MINOR 10
11
- # define GDAL_VERSION_REV 0
11
+ # define GDAL_VERSION_REV 1
12
12
  # define GDAL_VERSION_BUILD 0
13
13
  #endif
14
14
 
@@ -25,9 +25,9 @@
25
25
 
26
26
  #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
27
27
  #ifndef GDAL_RELEASE_DATE
28
- # define GDAL_RELEASE_DATE 20241101
28
+ # define GDAL_RELEASE_DATE 20250108
29
29
  #endif
30
30
  #ifndef GDAL_RELEASE_NAME
31
- # define GDAL_RELEASE_NAME "3.10.0"
31
+ # define GDAL_RELEASE_NAME "3.10.1"
32
32
  #endif
33
33
  #endif
@@ -727,7 +727,7 @@ OGRFeatureH CPL_DLL OGR_L_GetNextFeature(OGRLayerH) CPL_WARN_UNUSED_RESULT;
727
727
  /** Conveniency macro to iterate over features of a layer.
728
728
  *
729
729
  * Typical usage is:
730
- * <pre>
730
+ * \code{.cpp}
731
731
  * OGR_FOR_EACH_FEATURE_BEGIN(hFeat, hLayer)
732
732
  * {
733
733
  * // Do something, including continue, break;
@@ -735,14 +735,14 @@ OGRFeatureH CPL_DLL OGR_L_GetNextFeature(OGRLayerH) CPL_WARN_UNUSED_RESULT;
735
735
  * // outside of the loop, in which case use OGR_F_Destroy(hFeat))
736
736
  * }
737
737
  * OGR_FOR_EACH_FEATURE_END(hFeat)
738
- * </pre>
738
+ * \endcode
739
739
  *
740
740
  * In C++, you might want to use instead range-based loop:
741
- * <pre>
741
+ * \code{.cpp}
742
742
  * for( auto&& poFeature: poLayer )
743
743
  * {
744
744
  * }
745
- * </pre>
745
+ * \endcode
746
746
  *
747
747
  * @param hFeat variable name for OGRFeatureH. The variable will be declared
748
748
  * inside the macro body.
@@ -1136,13 +1136,13 @@ class CPL_DLL OGRFeature
1136
1136
  * (dereference) more than one iterator step at a time, since you will get
1137
1137
  * a reference to the same object (FieldValue) at each iteration step.
1138
1138
  *
1139
- * <pre>
1139
+ * \code{.cpp}
1140
1140
  * for( auto&& oField: poFeature )
1141
1141
  * {
1142
1142
  * std::cout << oField.GetIndex() << "," << oField.GetName()<< ": " <<
1143
1143
  * oField.GetAsString() << std::endl;
1144
1144
  * }
1145
- * </pre>
1145
+ * \endcode
1146
1146
  *
1147
1147
  * @since GDAL 2.3
1148
1148
  */
@@ -10,13 +10,13 @@
10
10
  # The variable CVF_VERSION must be set before calling configure_file().
11
11
 
12
12
 
13
- set(PACKAGE_VERSION "3.10.0")
13
+ set(PACKAGE_VERSION "3.10.1")
14
14
 
15
15
  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
16
16
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
17
17
  else()
18
18
 
19
- if("3.10.0" MATCHES "^([0-9]+)\\.([0-9]+)")
19
+ if("3.10.1" MATCHES "^([0-9]+)\\.([0-9]+)")
20
20
  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
21
21
  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
22
22
 
@@ -27,7 +27,7 @@ else()
27
27
  string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
28
28
  endif()
29
29
  else()
30
- set(CVF_VERSION_MAJOR "3.10.0")
30
+ set(CVF_VERSION_MAJOR "3.10.1")
31
31
  set(CVF_VERSION_MINOR "")
32
32
  endif()
33
33
 
@@ -1,4 +1,4 @@
1
- CONFIG_VERSION=3.10.0
1
+ CONFIG_VERSION=3.10.1
2
2
  CONFIG_INST_PREFIX=/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-x86_64
3
3
  CONFIG_INST_LIBS=-L/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-x86_64/lib -lgdal
4
4
  CONFIG_INST_CFLAGS=-I/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-x86_64/include
@@ -635,35 +635,41 @@
635
635
  </xs:complexType>
636
636
 
637
637
  <xs:complexType name="ArrayType">
638
- <xs:sequence>
639
- <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
640
- <xs:sequence>
641
- <xs:choice minOccurs="0" maxOccurs="unbounded">
642
- <xs:element name="Dimension" type="DimensionType"/>
643
- <xs:element name="DimensionRef" type="DimensionRefType"/>
644
- </xs:choice>
645
- </xs:sequence>
646
- <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
647
- <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
648
- <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
649
- <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
650
- <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
651
- <xs:choice>
652
- <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
638
+ <xs:complexContent>
639
+ <xs:extension base="AbstractArrayType">
653
640
  <xs:sequence>
654
- <xs:choice minOccurs="0" maxOccurs="unbounded">
655
- <xs:element name="ConstantValue" type="ConstantValueType"/>
656
- <xs:element name="InlineValues" type="InlineValuesType"/>
657
- <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
658
- <xs:element name="Source" type="SourceType"/>
641
+ <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
642
+ <xs:sequence>
643
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
644
+ <xs:element name="Dimension" type="DimensionType"/>
645
+ <xs:element name="DimensionRef" type="DimensionRefType"/>
646
+ </xs:choice>
647
+ </xs:sequence>
648
+ <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
649
+ <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
650
+ <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
651
+ <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
652
+ <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
653
+ <xs:choice>
654
+ <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
655
+ <xs:sequence>
656
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
657
+ <xs:element name="ConstantValue" type="ConstantValueType"/>
658
+ <xs:element name="InlineValues" type="InlineValuesType"/>
659
+ <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
660
+ <xs:element name="Source" type="SourceType"/>
661
+ </xs:choice>
662
+ </xs:sequence>
659
663
  </xs:choice>
664
+ <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
660
665
  </xs:sequence>
661
- </xs:choice>
662
- <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
663
- </xs:sequence>
664
- <xs:attribute name="name" type="xs:string" use="required"/>
666
+ <xs:attribute name="name" type="xs:string" use="required"/>
667
+ </xs:extension>
668
+ </xs:complexContent>
665
669
  </xs:complexType>
666
670
 
671
+ <xs:element name="Array" substitutionGroup="AbstractArray" type="ArrayType"/>
672
+
667
673
  <xs:complexType name="RegularlySpacedValuesType">
668
674
  <xs:attribute name="start" type="xs:double" use="required"/>
669
675
  <xs:attribute name="increment" type="xs:double" use="required"/>
@@ -8,7 +8,7 @@
8
8
  #ifndef GDAL_VERSION_MAJOR
9
9
  # define GDAL_VERSION_MAJOR 3
10
10
  # define GDAL_VERSION_MINOR 10
11
- # define GDAL_VERSION_REV 0
11
+ # define GDAL_VERSION_REV 1
12
12
  # define GDAL_VERSION_BUILD 0
13
13
  #endif
14
14
 
@@ -25,9 +25,9 @@
25
25
 
26
26
  #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
27
27
  #ifndef GDAL_RELEASE_DATE
28
- # define GDAL_RELEASE_DATE 20241101
28
+ # define GDAL_RELEASE_DATE 20250108
29
29
  #endif
30
30
  #ifndef GDAL_RELEASE_NAME
31
- # define GDAL_RELEASE_NAME "3.10.0"
31
+ # define GDAL_RELEASE_NAME "3.10.1"
32
32
  #endif
33
33
  #endif
@@ -727,7 +727,7 @@ OGRFeatureH CPL_DLL OGR_L_GetNextFeature(OGRLayerH) CPL_WARN_UNUSED_RESULT;
727
727
  /** Conveniency macro to iterate over features of a layer.
728
728
  *
729
729
  * Typical usage is:
730
- * <pre>
730
+ * \code{.cpp}
731
731
  * OGR_FOR_EACH_FEATURE_BEGIN(hFeat, hLayer)
732
732
  * {
733
733
  * // Do something, including continue, break;
@@ -735,14 +735,14 @@ OGRFeatureH CPL_DLL OGR_L_GetNextFeature(OGRLayerH) CPL_WARN_UNUSED_RESULT;
735
735
  * // outside of the loop, in which case use OGR_F_Destroy(hFeat))
736
736
  * }
737
737
  * OGR_FOR_EACH_FEATURE_END(hFeat)
738
- * </pre>
738
+ * \endcode
739
739
  *
740
740
  * In C++, you might want to use instead range-based loop:
741
- * <pre>
741
+ * \code{.cpp}
742
742
  * for( auto&& poFeature: poLayer )
743
743
  * {
744
744
  * }
745
- * </pre>
745
+ * \endcode
746
746
  *
747
747
  * @param hFeat variable name for OGRFeatureH. The variable will be declared
748
748
  * inside the macro body.
@@ -1136,13 +1136,13 @@ class CPL_DLL OGRFeature
1136
1136
  * (dereference) more than one iterator step at a time, since you will get
1137
1137
  * a reference to the same object (FieldValue) at each iteration step.
1138
1138
  *
1139
- * <pre>
1139
+ * \code{.cpp}
1140
1140
  * for( auto&& oField: poFeature )
1141
1141
  * {
1142
1142
  * std::cout << oField.GetIndex() << "," << oField.GetName()<< ": " <<
1143
1143
  * oField.GetAsString() << std::endl;
1144
1144
  * }
1145
- * </pre>
1145
+ * \endcode
1146
1146
  *
1147
1147
  * @since GDAL 2.3
1148
1148
  */
@@ -10,13 +10,13 @@
10
10
  # The variable CVF_VERSION must be set before calling configure_file().
11
11
 
12
12
 
13
- set(PACKAGE_VERSION "3.10.0")
13
+ set(PACKAGE_VERSION "3.10.1")
14
14
 
15
15
  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
16
16
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
17
17
  else()
18
18
 
19
- if("3.10.0" MATCHES "^([0-9]+)\\.([0-9]+)")
19
+ if("3.10.1" MATCHES "^([0-9]+)\\.([0-9]+)")
20
20
  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
21
21
  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
22
22
 
@@ -27,7 +27,7 @@ else()
27
27
  string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
28
28
  endif()
29
29
  else()
30
- set(CVF_VERSION_MAJOR "3.10.0")
30
+ set(CVF_VERSION_MAJOR "3.10.1")
31
31
  set(CVF_VERSION_MINOR "")
32
32
  endif()
33
33
 
@@ -5,24 +5,24 @@
5
5
  #
6
6
  # FindDotnet
7
7
  # ----------
8
- #
8
+ #
9
9
  # Find DotNet executable, and initialize functions for adding dotnet projects.
10
- #
10
+ #
11
11
  # Results are reported in the following variables::
12
- #
12
+ #
13
13
  # DOTNET_FOUND - True if dotnet executable is found
14
14
  # DOTNET_EXE - Dotnet executable
15
15
  # DOTNET_VERSION - Dotnet version as reported by dotnet executable
16
16
  # DOTNET_SDKS - Dotnet SDKs loaded as reported by dotnet executable
17
17
  # NUGET_EXE - Nuget executable (WIN32 only)
18
18
  # NUGET_CACHE_PATH - Nuget package cache path
19
- #
19
+ #
20
20
  # The following functions are defined to add dotnet/msbuild projects:
21
- #
21
+ #
22
22
  # ADD_DOTNET -- add a project to be built by dotnet.
23
- #
23
+ #
24
24
  # ```
25
- # ADD_DOTNET(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
25
+ # ADD_DOTNET(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
26
26
  # [CONFIG configuration]
27
27
  # [PLATFORM platform]
28
28
  # [PACKAGE nuget_package_dependencies... ]
@@ -34,12 +34,12 @@
34
34
  # [ARGUMENTS additional_build_args...]
35
35
  # [PACK_ARGUMENTS additional_pack_args...])
36
36
  # ```
37
- #
38
- # RUN_DOTNET -- Run a project with `dotnet run`. The `OUTPUT` argument represents artifacts
37
+ #
38
+ # RUN_DOTNET -- Run a project with `dotnet run`. The `OUTPUT` argument represents artifacts
39
39
  # produced by running the .NET program, and can be consumed from other build steps.
40
- #
40
+ #
41
41
  # ```
42
- # RUN_DOTNET(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
42
+ # RUN_DOTNET(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
43
43
  # [ARGUMENTS program_args...]
44
44
  # [OUTPUT outputs...]
45
45
  # [CONFIG configuration]
@@ -49,11 +49,11 @@
49
49
  # [CUSTOM_BUILDPROPS <CustomProp>value</CustomProp>....]
50
50
  # [SOURCES additional_file_dependencies... ])
51
51
  # ```
52
- #
52
+ #
53
53
  # ADD_MSBUILD -- add a project to be built by msbuild. Windows-only. When building in Unix systems, msbuild targets are skipped.
54
- #
54
+ #
55
55
  # ```
56
- # ADD_MSBUILD(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
56
+ # ADD_MSBUILD(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
57
57
  # [CONFIG configuration]
58
58
  # [PLATFORM platform]
59
59
  # [PACKAGE output_nuget_packages... ]
@@ -68,7 +68,7 @@
68
68
  # and if the program fails to build or run, the build fails. Currently only .NET Core App framework is supported.
69
69
  # Multiple smoke tests will be run one-by-one to avoid global resource conflicts.
70
70
  #
71
- # SMOKETEST_DOTNET(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
71
+ # SMOKETEST_DOTNET(<project_file> [RELEASE|DEBUG] [X86|X64|ANYCPU]
72
72
  # [ARGUMENTS program_args...]
73
73
  # [CONFIG configuration]
74
74
  # [PLATFORM platform]
@@ -76,12 +76,12 @@
76
76
  # [OUTPUT_PATH output_path relative to cmake binary output dir]
77
77
  # [CUSTOM_BUILDPROPS <CustomProp>value</CustomProp>....]
78
78
  # [SOURCES additional_file_dependencies... ])
79
- #
79
+ #
80
80
  # For all the above functions, `RELEASE|DEBUG` overrides `CONFIG`, `X86|X64|ANYCPU` overrides PLATFORM.
81
81
  #
82
82
  #
83
83
  # DOTNET_REGISTER_LOCAL_REPOSITORY -- register a local NuGet package repository.
84
- #
84
+ #
85
85
  # ```
86
86
  # DOTNET_REGISTER_LOCAL_REPOSITORY(repo_name repo_path)
87
87
  # ```
@@ -97,7 +97,7 @@
97
97
  # [ARGUMENTS additional_dotnet_test_args...]
98
98
  # [OUTPUT_PATH output_path relative to cmake binary output dir])
99
99
  # ```
100
- #
100
+ #
101
101
  # GEN_DOTNET_PROPS -- Generates a Directory.Build.props file. The created file is populated with MSBuild properties:
102
102
  # - DOTNET_PACKAGE_VERSION: a version string that can be referenced in the actual project file as $(DOTNET_PACKAGE_VERSION).
103
103
  # The version string value can be set with PACKAGE_VERSION argument, and defaults to '1.0.0'.
@@ -111,10 +111,7 @@
111
111
  # [PACKAGE_VERSION version]
112
112
  # [XML_INJECT xml_injection])
113
113
  # ```
114
- #
115
- # Require 3.5 for batch copy multiple files
116
-
117
- cmake_minimum_required(VERSION 3.5.0)
114
+ #
118
115
 
119
116
  IF(DOTNET_FOUND)
120
117
  RETURN()
@@ -184,11 +181,11 @@ ENDFUNCTION()
184
181
  FUNCTION(DOTNET_GET_DEPS _DN_PROJECT arguments)
185
182
  CMAKE_PARSE_ARGUMENTS(
186
183
  # prefix
187
- _DN
184
+ _DN
188
185
  # options (flags)
189
- "RELEASE;DEBUG;X86;X64;ANYCPU;NETCOREAPP"
186
+ "RELEASE;DEBUG;X86;X64;ANYCPU;NETCOREAPP"
190
187
  # oneValueArgs
191
- "NAME;CONFIG;PLATFORM;VERSION;OUTPUT_PATH"
188
+ "NAME;CONFIG;PLATFORM;VERSION;OUTPUT_PATH"
192
189
  # multiValueArgs
193
190
  "PACKAGE;DEPENDS;ARGUMENTS;PACK_ARGUMENTS;OUTPUT;SOURCES;CUSTOM_BUILDPROPS,BUILD_OPTIONS"
194
191
  # the input arguments
@@ -199,7 +196,7 @@ FUNCTION(DOTNET_GET_DEPS _DN_PROJECT arguments)
199
196
  GET_FILENAME_COMPONENT(_DN_projname "${_DN_PROJECT}" NAME)
200
197
  STRING(REGEX REPLACE "\\.[^.]*$" "" _DN_projname_noext ${_DN_projname})
201
198
 
202
- FILE(GLOB_RECURSE DOTNET_deps
199
+ FILE(GLOB_RECURSE DOTNET_deps
203
200
  ${_DN_proj_dir}/*.cs
204
201
  ${_DN_proj_dir}/*.fs
205
202
  ${_DN_proj_dir}/*.vb
@@ -328,14 +325,14 @@ ENDMACRO()
328
325
 
329
326
  MACRO(DOTNET_BUILD_COMMANDS)
330
327
  IF(${DOTNET_IS_MSBUILD})
331
- SET(build_dotnet_cmds
328
+ SET(build_dotnet_cmds
332
329
  COMMAND ${CMAKE_COMMAND} -E echo "======= Building msbuild project ${DOTNET_PROJNAME} [${DOTNET_CONFIG} ${DOTNET_PLATFORM}]"
333
330
  COMMAND ${NUGET_EXE} restore -Force ${DOTNET_PROJPATH}
334
331
  COMMAND ${DOTNET_EXE} msbuild ${DOTNET_PROJPATH} /t:Clean ${DOTNET_BUILD_PROPERTIES} /p:Configuration="${DOTNET_CONFIG}"
335
332
  COMMAND ${DOTNET_EXE} msbuild ${DOTNET_PROJPATH} /t:Build ${DOTNET_BUILD_PROPERTIES} /p:Configuration="${DOTNET_CONFIG}" ${DOTNET_ARGUMENTS})
336
333
  SET(build_dotnet_type "msbuild")
337
334
  ELSE()
338
- SET(build_dotnet_cmds
335
+ SET(build_dotnet_cmds
339
336
  COMMAND ${CMAKE_COMMAND} -E echo "======= Building .NET project ${DOTNET_PROJNAME} [${DOTNET_CONFIG} ${DOTNET_PLATFORM}]")
340
337
  foreach (_src ${DOTNET_SOURCES} )
341
338
  LIST(APPEND build_dotnet_cmds COMMAND ${DOTNET_EXE} add ${DOTNET_PROJPATH} reference ${_src})
@@ -362,10 +359,10 @@ MACRO(DOTNET_BUILD_COMMANDS)
362
359
  MESSAGE("-- Adding ${build_dotnet_type} project ${DOTNET_PROJPATH} (no nupkg)")
363
360
  ENDIF()
364
361
  endif()
365
-
366
- LIST(APPEND build_dotnet_cmds COMMAND ${DOTNET_EXE} pack
367
- --no-build --no-restore ${DOTNET_PROJPATH}
368
- -c ${DOTNET_CONFIG} ${DOTNET_BUILD_PROPERTIES} ${DOTNET_PACK_OPTIONS}
362
+
363
+ LIST(APPEND build_dotnet_cmds COMMAND ${DOTNET_EXE} pack
364
+ --no-build --no-restore ${DOTNET_PROJPATH}
365
+ -c ${DOTNET_CONFIG} ${DOTNET_BUILD_PROPERTIES} ${DOTNET_PACK_OPTIONS}
369
366
  --output ${CMAKE_CURRENT_BINARY_DIR} -p:PackageVersion=${DOTNET_PACKAGE_VERSION} )
370
367
  LIST(APPEND DOTNET_OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/${DOTNET_PROJNAME}.buildtimestamp)
371
368
  LIST(APPEND build_dotnet_cmds COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${DOTNET_PROJNAME}.buildtimestamp)
@@ -416,7 +413,7 @@ FUNCTION(RUN_DOTNET DOTNET_PROJECT)
416
413
  COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${DOTNET_PROJNAME}.runtimestamp
417
414
  WORKING_DIRECTORY ${DOTNET_OUTPUT_PATH})
418
415
  ADD_CUSTOM_TARGET(
419
- ${DOTNET_PROJNAME}
416
+ ${DOTNET_PROJNAME}
420
417
  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${DOTNET_PROJNAME}.runtimestamp ${DOTNET_RUN_OUTPUT})
421
418
  ADD_DOTNET_DEPENDENCY_TARGETS()
422
419
  ENDFUNCTION()
@@ -469,9 +466,9 @@ FUNCTION(GEN_DOTNET_PROPS target_props_file)
469
466
  # prefix
470
467
  _DNP
471
468
  # options (flags)
472
- ""
469
+ ""
473
470
  # oneValueArgs
474
- "PACKAGE_VERSION;XML_INJECT"
471
+ "PACKAGE_VERSION;XML_INJECT"
475
472
  # multiValueArgs
476
473
  ""
477
474
  # the input arguments
@@ -496,4 +493,4 @@ ENDFUNCTION()
496
493
 
497
494
 
498
495
  MESSAGE("-- Found .NET toolchain: ${DOTNET_EXE} (version ${DOTNET_VERSION})")
499
- SET(DOTNET_FOUND TRUE)
496
+ SET(DOTNET_FOUND TRUE)