Skip to content

Commit 3235acb

Browse files
- Added the Unreal 5.6 main and PCG plugins to the build list on macOS and
dropped the old 5.4 and 5.5 plugins. Successfully building the 5.6 plugins on Mac required a mini-sweep to locally ignore "declaration shadows a field" (-Wshadow) warnings/errors when including PCG headers.
1 parent 2a9eb2c commit 3235acb

5 files changed

Lines changed: 56 additions & 1 deletion

File tree

Source/HoudiniEngine/Private/HoudiniPCGComponent.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,18 @@
2828

2929
#include "CoreMinimal.h"
3030
#include "HoudiniPCGCookable.h"
31+
32+
#if defined(__clang__)
33+
#pragma clang diagnostic push
34+
#pragma clang diagnostic ignored "-Wshadow"
35+
#endif
36+
3137
#include "PCGComponent.h"
38+
39+
#if defined(__clang__)
40+
#pragma clang diagnostic pop
41+
#endif
42+
3243
#include "UObject/ObjectMacros.h"
3344
#include "IDetailCustomization.h"
3445
#include "HoudiniEngine.h"
@@ -75,4 +86,4 @@ class HOUDINIENGINE_API AHoudiniPCGActor : public AActor
7586
public:
7687
GENERATED_BODY()
7788

78-
};
89+
};

Source/HoudiniEngine/Private/HoudiniPCGNode.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,18 @@
2323

2424
#pragma once
2525
#include "HoudiniAsset.h"
26+
27+
#if defined(__clang__)
28+
#pragma clang diagnostic push
29+
#pragma clang diagnostic ignored "-Wshadow"
30+
#endif
31+
2632
#include "PCGContext.h"
33+
34+
#if defined(__clang__)
35+
#pragma clang diagnostic pop
36+
#endif
37+
2738
#include "PCGSettings.h"
2839
#include "Async/PCGAsyncLoadingContext.h"
2940
#include "HoudiniCookable.h"

Source/HoudiniEngineEditor/Private/HoudiniPCGDetails.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,18 @@
3131
#include "HoudiniOutputDetails.h"
3232
#include "IDetailCustomization.h"
3333
#include "Async/PCGAsyncLoadingContext.h"
34+
35+
#if defined(__clang__)
36+
#pragma clang diagnostic push
37+
#pragma clang diagnostic ignored "-Wshadow"
38+
#endif
39+
3440
#include "PCGContext.h"
41+
42+
#if defined(__clang__)
43+
#pragma clang diagnostic pop
44+
#endif
45+
3546
#include "PCGGraph.h"
3647

3748
class UHoudiniPCGSettingsCustomization : public IDetailCustomization

Source/HoudiniEngineEditor/Private/HoudiniPCGSettingsDetails.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,18 @@
2828

2929
#include "CoreMinimal.h"
3030
#include "HoudiniPCGCookable.h"
31+
32+
#if defined(__clang__)
33+
#pragma clang diagnostic push
34+
#pragma clang diagnostic ignored "-Wshadow"
35+
#endif
36+
3137
#include "PCGComponent.h"
38+
39+
#if defined(__clang__)
40+
#pragma clang diagnostic pop
41+
#endif
42+
3243
#include "UObject/ObjectMacros.h"
3344
#include "IDetailCustomization.h"
3445

Source/HoudiniEngineEditor/Private/Tests/HoudiniEditorTestPCG.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,18 @@
3131
#include "HoudiniEditorUnitTestUtils.h"
3232
#include "HoudiniParameterFloat.h"
3333
#include <FileHelpers.h>
34+
35+
#if defined(__clang__)
36+
#pragma clang diagnostic push
37+
#pragma clang diagnostic ignored "-Wshadow"
38+
#endif
39+
3440
#include "PCGComponent.h"
41+
42+
#if defined(__clang__)
43+
#pragma clang diagnostic pop
44+
#endif
45+
3546
#include "PCGVolume.h"
3647
#include "PCGGraph.h"
3748
#include "PCGDataAsset.h"

0 commit comments

Comments
 (0)