Skip to content

Commit

Permalink
Build fix
Browse files Browse the repository at this point in the history
Matt Young committed Jan 1, 2025
1 parent e27c32c commit f6ceb5b
Showing 2 changed files with 88 additions and 88 deletions.
104 changes: 52 additions & 52 deletions meson.build
Original file line number Diff line number Diff line change
@@ -690,23 +690,6 @@ commonSourceFiles = files([
'src/editors/StyleEditor.cpp',
'src/editors/WaterEditor.cpp',
'src/editors/YeastEditor.cpp',
'src/qtModels/listModels/BoilListModel.cpp',
'src/qtModels/listModels/EquipmentListModel.cpp',
'src/qtModels/listModels/FermentableListModel.cpp',
'src/qtModels/listModels/FermentationListModel.cpp',
'src/qtModels/listModels/HopListModel.cpp',
'src/qtModels/listModels/MashListModel.cpp',
'src/qtModels/listModels/MashStepListModel.cpp',
'src/qtModels/listModels/MiscListModel.cpp',
'src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp',
'src/qtModels/listModels/RecipeAdditionHopListModel.cpp',
'src/qtModels/listModels/RecipeAdditionMiscListModel.cpp',
'src/qtModels/listModels/RecipeAdditionYeastListModel.cpp',
'src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp',
'src/qtModels/listModels/SaltListModel.cpp',
'src/qtModels/listModels/StyleListModel.cpp',
'src/qtModels/listModels/WaterListModel.cpp',
'src/qtModels/listModels/YeastListModel.cpp',
'src/measurement/Amount.cpp',
'src/measurement/ColorMethods.cpp',
'src/measurement/IbuMethods.cpp',
@@ -750,24 +733,23 @@ commonSourceFiles = files([
'src/model/Style.cpp',
'src/model/Water.cpp',
'src/model/Yeast.cpp',
'src/serialization/ImportExport.cpp',
'src/serialization/SerializationRecord.cpp',
'src/serialization/json/BeerJson.cpp',
'src/serialization/json/JsonCoding.cpp',
'src/serialization/json/JsonMeasureableUnitsMapping.cpp',
'src/serialization/json/JsonRecord.cpp',
'src/serialization/json/JsonRecordDefinition.cpp',
'src/serialization/json/JsonSchema.cpp',
'src/serialization/json/JsonUtils.cpp',
'src/serialization/json/JsonXPath.cpp',
'src/serialization/xml/BeerXml.cpp',
'src/serialization/xml/BtDomErrorHandler.cpp',
'src/serialization/xml/XercesHelpers.cpp',
'src/serialization/xml/XmlCoding.cpp',
'src/serialization/xml/XmlMashRecord.cpp',
'src/serialization/xml/XmlRecipeRecord.cpp',
'src/serialization/xml/XmlRecord.cpp',
'src/serialization/xml/XmlRecordDefinition.cpp',
'src/qtModels/listModels/BoilListModel.cpp',
'src/qtModels/listModels/EquipmentListModel.cpp',
'src/qtModels/listModels/FermentableListModel.cpp',
'src/qtModels/listModels/FermentationListModel.cpp',
'src/qtModels/listModels/HopListModel.cpp',
'src/qtModels/listModels/MashListModel.cpp',
'src/qtModels/listModels/MashStepListModel.cpp',
'src/qtModels/listModels/MiscListModel.cpp',
'src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp',
'src/qtModels/listModels/RecipeAdditionHopListModel.cpp',
'src/qtModels/listModels/RecipeAdditionMiscListModel.cpp',
'src/qtModels/listModels/RecipeAdditionYeastListModel.cpp',
'src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp',
'src/qtModels/listModels/SaltListModel.cpp',
'src/qtModels/listModels/StyleListModel.cpp',
'src/qtModels/listModels/WaterListModel.cpp',
'src/qtModels/listModels/YeastListModel.cpp',
'src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp',
'src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp',
'src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp',
@@ -802,6 +784,24 @@ commonSourceFiles = files([
'src/qtModels/tableModels/StyleTableModel.cpp',
'src/qtModels/tableModels/WaterTableModel.cpp',
'src/qtModels/tableModels/YeastTableModel.cpp',
'src/serialization/ImportExport.cpp',
'src/serialization/SerializationRecord.cpp',
'src/serialization/json/BeerJson.cpp',
'src/serialization/json/JsonCoding.cpp',
'src/serialization/json/JsonMeasureableUnitsMapping.cpp',
'src/serialization/json/JsonRecord.cpp',
'src/serialization/json/JsonRecordDefinition.cpp',
'src/serialization/json/JsonSchema.cpp',
'src/serialization/json/JsonUtils.cpp',
'src/serialization/json/JsonXPath.cpp',
'src/serialization/xml/BeerXml.cpp',
'src/serialization/xml/BtDomErrorHandler.cpp',
'src/serialization/xml/XercesHelpers.cpp',
'src/serialization/xml/XmlCoding.cpp',
'src/serialization/xml/XmlMashRecord.cpp',
'src/serialization/xml/XmlRecipeRecord.cpp',
'src/serialization/xml/XmlRecord.cpp',
'src/serialization/xml/XmlRecordDefinition.cpp',
'src/trees/TreeFilterProxyModel.cpp',
'src/trees/TreeModel.cpp',
'src/trees/TreeNode.cpp',
@@ -923,23 +923,6 @@ mocHeaders = files([
'src/editors/StyleEditor.h',
'src/editors/WaterEditor.h',
'src/editors/YeastEditor.h',
'src/qtModels/listModels/BoilListModel.h',
'src/qtModels/listModels/EquipmentListModel.h',
'src/qtModels/listModels/FermentableListModel.h',
'src/qtModels/listModels/FermentationListModel.h',
'src/qtModels/listModels/HopListModel.h',
'src/qtModels/listModels/MashListModel.h',
'src/qtModels/listModels/MashStepListModel.h',
'src/qtModels/listModels/MiscListModel.h',
'src/qtModels/listModels/RecipeAdditionFermentableListModel.h',
'src/qtModels/listModels/RecipeAdditionHopListModel.h',
'src/qtModels/listModels/RecipeAdditionMiscListModel.h',
'src/qtModels/listModels/RecipeAdditionYeastListModel.h',
'src/qtModels/listModels/RecipeAdjustmentSaltListModel.h',
'src/qtModels/listModels/SaltListModel.h',
'src/qtModels/listModels/StyleListModel.h',
'src/qtModels/listModels/WaterListModel.h',
'src/qtModels/listModels/YeastListModel.h',
'src/model/Boil.h',
'src/model/BoilStep.h',
'src/model/BrewNote.h',
@@ -978,6 +961,23 @@ mocHeaders = files([
'src/model/Style.h',
'src/model/Water.h',
'src/model/Yeast.h',
'src/qtModels/listModels/BoilListModel.h',
'src/qtModels/listModels/EquipmentListModel.h',
'src/qtModels/listModels/FermentableListModel.h',
'src/qtModels/listModels/FermentationListModel.h',
'src/qtModels/listModels/HopListModel.h',
'src/qtModels/listModels/MashListModel.h',
'src/qtModels/listModels/MashStepListModel.h',
'src/qtModels/listModels/MiscListModel.h',
'src/qtModels/listModels/RecipeAdditionFermentableListModel.h',
'src/qtModels/listModels/RecipeAdditionHopListModel.h',
'src/qtModels/listModels/RecipeAdditionMiscListModel.h',
'src/qtModels/listModels/RecipeAdditionYeastListModel.h',
'src/qtModels/listModels/RecipeAdjustmentSaltListModel.h',
'src/qtModels/listModels/SaltListModel.h',
'src/qtModels/listModels/StyleListModel.h',
'src/qtModels/listModels/WaterListModel.h',
'src/qtModels/listModels/YeastListModel.h',
'src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h',
'src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h',
'src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h',
72 changes: 36 additions & 36 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ set(filesToCompile_cpp
${repoDir}/src/HydrometerTool.cpp
${repoDir}/src/IbuGuSlider.cpp
${repoDir}/src/InventoryFormatter.cpp
${repoDir}/src/LatestReleaseFinder
${repoDir}/src/LatestReleaseFinder.cpp
${repoDir}/src/Localization.cpp
${repoDir}/src/Logging.cpp
${repoDir}/src/MainWindow.cpp
@@ -121,23 +121,6 @@ set(filesToCompile_cpp
${repoDir}/src/editors/StyleEditor.cpp
${repoDir}/src/editors/WaterEditor.cpp
${repoDir}/src/editors/YeastEditor.cpp
${repoDir}/src/qtModels/listModels/BoilListModel.cpp
${repoDir}/src/qtModels/listModels/EquipmentListModel.cpp
${repoDir}/src/qtModels/listModels/FermentableListModel.cpp
${repoDir}/src/qtModels/listModels/FermentationListModel.cpp
${repoDir}/src/qtModels/listModels/HopListModel.cpp
${repoDir}/src/qtModels/listModels/MashListModel.cpp
${repoDir}/src/qtModels/listModels/MashStepListModel.cpp
${repoDir}/src/qtModels/listModels/MiscListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionHopListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp
${repoDir}/src/qtModels/listModels/SaltListModel.cpp
${repoDir}/src/qtModels/listModels/StyleListModel.cpp
${repoDir}/src/qtModels/listModels/WaterListModel.cpp
${repoDir}/src/qtModels/listModels/YeastListModel.cpp
${repoDir}/src/measurement/Amount.cpp
${repoDir}/src/measurement/ColorMethods.cpp
${repoDir}/src/measurement/IbuMethods.cpp
@@ -181,24 +164,23 @@ set(filesToCompile_cpp
${repoDir}/src/model/Style.cpp
${repoDir}/src/model/Water.cpp
${repoDir}/src/model/Yeast.cpp
${repoDir}/src/serialization/ImportExport.cpp
${repoDir}/src/serialization/SerializationRecord.cpp
${repoDir}/src/serialization/json/BeerJson.cpp
${repoDir}/src/serialization/json/JsonCoding.cpp
${repoDir}/src/serialization/json/JsonMeasureableUnitsMapping.cpp
${repoDir}/src/serialization/json/JsonRecord.cpp
${repoDir}/src/serialization/json/JsonRecordDefinition.cpp
${repoDir}/src/serialization/json/JsonSchema.cpp
${repoDir}/src/serialization/json/JsonUtils.cpp
${repoDir}/src/serialization/json/JsonXPath.cpp
${repoDir}/src/serialization/xml/BeerXml.cpp
${repoDir}/src/serialization/xml/BtDomErrorHandler.cpp
${repoDir}/src/serialization/xml/XercesHelpers.cpp
${repoDir}/src/serialization/xml/XmlCoding.cpp
${repoDir}/src/serialization/xml/XmlMashRecord.cpp
${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp
${repoDir}/src/serialization/xml/XmlRecord.cpp
${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp
${repoDir}/src/qtModels/listModels/BoilListModel.cpp
${repoDir}/src/qtModels/listModels/EquipmentListModel.cpp
${repoDir}/src/qtModels/listModels/FermentableListModel.cpp
${repoDir}/src/qtModels/listModels/FermentationListModel.cpp
${repoDir}/src/qtModels/listModels/HopListModel.cpp
${repoDir}/src/qtModels/listModels/MashListModel.cpp
${repoDir}/src/qtModels/listModels/MashStepListModel.cpp
${repoDir}/src/qtModels/listModels/MiscListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionHopListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp
${repoDir}/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp
${repoDir}/src/qtModels/listModels/SaltListModel.cpp
${repoDir}/src/qtModels/listModels/StyleListModel.cpp
${repoDir}/src/qtModels/listModels/WaterListModel.cpp
${repoDir}/src/qtModels/listModels/YeastListModel.cpp
${repoDir}/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp
${repoDir}/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp
${repoDir}/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp
@@ -233,6 +215,24 @@ set(filesToCompile_cpp
${repoDir}/src/qtModels/tableModels/StyleTableModel.cpp
${repoDir}/src/qtModels/tableModels/WaterTableModel.cpp
${repoDir}/src/qtModels/tableModels/YeastTableModel.cpp
${repoDir}/src/serialization/ImportExport.cpp
${repoDir}/src/serialization/SerializationRecord.cpp
${repoDir}/src/serialization/json/BeerJson.cpp
${repoDir}/src/serialization/json/JsonCoding.cpp
${repoDir}/src/serialization/json/JsonMeasureableUnitsMapping.cpp
${repoDir}/src/serialization/json/JsonRecord.cpp
${repoDir}/src/serialization/json/JsonRecordDefinition.cpp
${repoDir}/src/serialization/json/JsonSchema.cpp
${repoDir}/src/serialization/json/JsonUtils.cpp
${repoDir}/src/serialization/json/JsonXPath.cpp
${repoDir}/src/serialization/xml/BeerXml.cpp
${repoDir}/src/serialization/xml/BtDomErrorHandler.cpp
${repoDir}/src/serialization/xml/XercesHelpers.cpp
${repoDir}/src/serialization/xml/XmlCoding.cpp
${repoDir}/src/serialization/xml/XmlMashRecord.cpp
${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp
${repoDir}/src/serialization/xml/XmlRecord.cpp
${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp
${repoDir}/src/trees/TreeFilterProxyModel.cpp
${repoDir}/src/trees/TreeModel.cpp
${repoDir}/src/trees/TreeNode.cpp

0 comments on commit f6ceb5b

Please sign in to comment.