Install missing header files when compiling without object stream (#1294

) Fixes #1293
jrouwe · Oct 2, 2024 · 0a7d250 · 0a7d250
1 parent 25d3eaf
commit 0a7d250
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Jolt/Jolt.cmake b/Jolt/Jolt.cmake
@@ -136,8 +136,13 @@ set(JOLT_PHYSICS_SRC_FILES
 	${JOLT_PHYSICS_ROOT}/Math/Vec4.h
 	${JOLT_PHYSICS_ROOT}/Math/Vec4.inl
 	${JOLT_PHYSICS_ROOT}/Math/Vector.h
+	${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStream.h
+	${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableAttribute.h
+	${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableAttributeEnum.h
+	${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableAttributeTyped.h
 	${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableObject.cpp
 	${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableObject.h
+	${JOLT_PHYSICS_ROOT}/ObjectStream/TypeDeclarations.h
 	${JOLT_PHYSICS_ROOT}/Physics/Body/AllowedDOFs.h
 	${JOLT_PHYSICS_ROOT}/Physics/Body/Body.cpp
 	${JOLT_PHYSICS_ROOT}/Physics/Body/Body.h
@@ -437,7 +442,6 @@ if (ENABLE_OBJECT_STREAM)
 		${JOLT_PHYSICS_SRC_FILES}
 		${JOLT_PHYSICS_ROOT}/ObjectStream/GetPrimitiveTypeOfType.h
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStream.cpp
-		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStream.h
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStreamBinaryIn.cpp
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStreamBinaryIn.h
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStreamBinaryOut.cpp
@@ -451,11 +455,7 @@ if (ENABLE_OBJECT_STREAM)
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStreamTextOut.cpp
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStreamTextOut.h
 		${JOLT_PHYSICS_ROOT}/ObjectStream/ObjectStreamTypes.h
-		${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableAttribute.h
-		${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableAttributeEnum.h
-		${JOLT_PHYSICS_ROOT}/ObjectStream/SerializableAttributeTyped.h
 		${JOLT_PHYSICS_ROOT}/ObjectStream/TypeDeclarations.cpp
-		${JOLT_PHYSICS_ROOT}/ObjectStream/TypeDeclarations.h
 	)
 endif()
 

diff --git a/Jolt/ObjectStream/SerializableAttributeEnum.h b/Jolt/ObjectStream/SerializableAttributeEnum.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
+#ifdef JPH_OBJECT_STREAM
+
 #include <Jolt/ObjectStream/SerializableAttribute.h>
 #include <Jolt/ObjectStream/ObjectStream.h>
 
-#ifdef JPH_OBJECT_STREAM
-
 JPH_NAMESPACE_BEGIN
 
 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Jolt/ObjectStream/SerializableAttributeTyped.h b/Jolt/ObjectStream/SerializableAttributeTyped.h
@@ -4,12 +4,12 @@
 
 #pragma once
 
+#ifdef JPH_OBJECT_STREAM
+
 #include <Jolt/ObjectStream/SerializableAttribute.h>
 #include <Jolt/ObjectStream/GetPrimitiveTypeOfType.h>
 #include <Jolt/ObjectStream/ObjectStream.h>
 
-#ifdef JPH_OBJECT_STREAM
-
 JPH_NAMESPACE_BEGIN
 
 //////////////////////////////////////////////////////////////////////////////////////////