Change the include path to not include the "HAPI" directory

sideeffects · Jan 20, 2017 · b0126d9 · b0126d9
1 parent 403ddf5
commit b0126d9
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 23 deletions.
diff --git a/Asset.h b/Asset.h
@@ -6,7 +6,7 @@
 #include <maya/MString.h>
 #include <maya/MTime.h>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 #include "OutputObject.h"
 

diff --git a/EngineCommand.C b/EngineCommand.C
@@ -4,8 +4,8 @@
 #include <maya/MArgList.h>
 #include <maya/MStatus.h>
 
-#include <HAPI.h>
-#include <HAPI_Version.h>
+#include <HAPI/HAPI.h>
+#include <HAPI/HAPI_Version.h>
 
 #include "SubCommand.h"
 

diff --git a/Input.C b/Input.C
@@ -14,7 +14,7 @@
 #include <maya/MPlugArray.h>
 #include <maya/MString.h>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 #include "AssetNode.h"
 #include "InputMesh.h"

diff --git a/Input.h b/Input.h
@@ -5,7 +5,7 @@
 
 #include <maya/MDataHandle.h>
 
-#include <HAPI_Common.h>
+#include <HAPI/HAPI_Common.h>
 
 class Input;
 class MDataBlock;

diff --git a/InputCurve.C b/InputCurve.C
@@ -7,7 +7,7 @@
 #include <maya/MPointArray.h>
 #include <maya/MFnNurbsCurve.h>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 #include "util.h"
 

diff --git a/InputCurve.h b/InputCurve.h
@@ -3,7 +3,7 @@
 
 #include "Input.h"
 
-#include <HAPI_Common.h>
+#include <HAPI/HAPI_Common.h>
 
 class InputCurve : public Input
 {

diff --git a/InputCurveNode.h b/InputCurveNode.h
@@ -3,7 +3,7 @@
 
 #include <maya/MPxNode.h>
 #include <maya/MTypeId.h>
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 class MPlugArray;
 

diff --git a/InputMergeNode.h b/InputMergeNode.h
@@ -3,7 +3,7 @@
 
 #include <maya/MPxNode.h>
 
-#include <HAPI_Common.h>
+#include <HAPI/HAPI_Common.h>
 
 class InputMergeNode : public MPxNode
 {

diff --git a/InputMesh.h b/InputMesh.h
@@ -3,7 +3,7 @@
 
 #include "Input.h"
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 class MFnMesh;
 class MObjectArray;

diff --git a/InputParticle.h b/InputParticle.h
@@ -3,7 +3,7 @@
 
 #include "Input.h"
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 class InputParticle : public Input
 {

diff --git a/InputTransformNode.h b/InputTransformNode.h
@@ -3,7 +3,7 @@
 
 #include <maya/MPxNode.h>
 
-#include <HAPI_Common.h>
+#include <HAPI/HAPI_Common.h>
 
 class InputTransformNode : public MPxNode
 {

diff --git a/OutputGeometry.h b/OutputGeometry.h
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 class OutputObject;
 class OutputGeometryPart;

diff --git a/OutputObject.h b/OutputObject.h
@@ -11,7 +11,7 @@
 #include <maya/MPlug.h>
 #include <maya/MDataBlock.h>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 class Asset;
 

diff --git a/SyncAttribute.C b/SyncAttribute.C
@@ -9,7 +9,7 @@
 #include <maya/MPlugArray.h>
 #include <maya/MRampAttribute.h>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 #include "Asset.h"
 #include "AssetNode.h"

diff --git a/SyncAttribute.h b/SyncAttribute.h
@@ -6,7 +6,7 @@
 #include <maya/MDGModifier.h>
 #include <maya/MObject.h>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 class MFnCompoundAttribute;
 

diff --git a/cmake/Modules/FindHoudiniEngine.cmake b/cmake/Modules/FindHoudiniEngine.cmake
@@ -56,15 +56,15 @@ if ( DEFINED HoudiniEngine_ROOT )
 endif ()
 if ( _houdiniengine_root )
     if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
-        list( APPEND _houdiniengine_include_search_dirs "${_houdiniengine_root}/toolkit/include/HAPI" )
+        list( APPEND _houdiniengine_include_search_dirs "${_houdiniengine_root}/toolkit/include" )
         list( APPEND _houdiniengine_library_search_dirs "${_houdiniengine_root}/dsolib" )
         list( APPEND _houdiniengine_binary_search_dirs "${_houdiniengine_root}/bin" )
     elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
-        list( APPEND _houdiniengine_include_search_dirs "${_houdiniengine_root}/toolkit/include/HAPI" )
+        list( APPEND _houdiniengine_include_search_dirs "${_houdiniengine_root}/toolkit/include" )
         list( APPEND _houdiniengine_library_search_dirs "${_houdiniengine_root}/custom/houdini/dsolib" )
         list( APPEND _houdiniengine_binary_search_dirs "${_houdiniengine_root}/bin" )
     elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
-        list( APPEND _houdiniengine_include_search_dirs "${_houdiniengine_root}/toolkit/include/HAPI" )
+        list( APPEND _houdiniengine_include_search_dirs "${_houdiniengine_root}/toolkit/include" )
         list( APPEND _houdiniengine_library_search_dirs "${_houdiniengine_root}/../Libraries" )
         list( APPEND _houdiniengine_binary_search_dirs "${_houdiniengine_root}/bin" )
     endif ()
@@ -75,7 +75,7 @@ endif ()
 ########################################
 find_path(
     HoudiniEngine_INCLUDE_DIRS
-    HAPI.h
+    HAPI/HAPI.h
     HINTS ${_houdiniengine_include_search_dirs}
     )
 list( APPEND _houdiniengine_required_vars HoudiniEngine_INCLUDE_DIRS )

diff --git a/hapiutil.h b/hapiutil.h
@@ -1,7 +1,7 @@
 #ifndef __hapiutil_h__
 #define __hapiutil_h__
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 #include "traits.h"
 #include "types.h"

diff --git a/plugin.C b/plugin.C
@@ -15,7 +15,7 @@
 #include "InputMergeNode.h"
 #include "util.h"
 
-#include <HAPI_Version.h>
+#include <HAPI/HAPI_Version.h>
 
 #include <cstdlib>
 #ifndef _WIN32

diff --git a/util.h b/util.h
@@ -13,7 +13,7 @@
 #include <memory>
 #include <string>
 
-#include <HAPI.h>
+#include <HAPI/HAPI.h>
 
 #include "traits.h"
 #include "types.h"