- ${CMAKE_BINARY_DIR}/include is now added privately in mayaUsd proje…

…ct and didn't really belong in the public list. This makes it more explicit and clear as where the include directories are coming from. - Removed unused ${MAYAUSD_INCLUDE_DIR} variable.
Autodesk · Mar 5, 2020 · 904b394 · 904b394
1 parent e402ced
commit 904b394
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 7 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -54,12 +54,12 @@ endif()
 # -----------------------------------------------------------------------------
 target_include_directories(${PROJECT_NAME} 
     PUBLIC
-        ${CMAKE_BINARY_DIR}/include
         ${MAYA_INCLUDE_DIRS}
         ${PXR_INCLUDE_DIRS}
         $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}/include
 )
 
 # -----------------------------------------------------------------------------

diff --git a/lib/python/CMakeLists.txt b/lib/python/CMakeLists.txt
@@ -44,9 +44,12 @@ target_compile_definitions(${PYTHON_TARGET_NAME}
 )
 
 # -----------------------------------------------------------------------------
-# properties
+# include directories
 # -----------------------------------------------------------------------------
-set_python_module_property(${PYTHON_TARGET_NAME})
+target_include_directories(${PYTHON_TARGET_NAME}
+    PRIVATE
+        ${CMAKE_BINARY_DIR}/include
+)
 
 # -----------------------------------------------------------------------------
 # link libraries
@@ -56,6 +59,11 @@ target_link_libraries(${PYTHON_TARGET_NAME}
         ${PROJECT_NAME}
 )
 
+# -----------------------------------------------------------------------------
+# properties
+# -----------------------------------------------------------------------------
+set_python_module_property(${PYTHON_TARGET_NAME})
+
 # -----------------------------------------------------------------------------
 # run-time search paths
 # -----------------------------------------------------------------------------

diff --git a/lib/render/mayaToHydra/CMakeLists.txt b/lib/render/mayaToHydra/CMakeLists.txt
@@ -40,6 +40,7 @@ target_include_directories(${TARGET_NAME}
         "${CMAKE_CURRENT_SOURCE_DIR}/.."
         ${MAYA_INCLUDE_DIRS}
         ${CMAKE_BINARY_DIR}/usd
+        ${CMAKE_BINARY_DIR}/include
         $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
 )
 

diff --git a/lib/ufe/CMakeLists.txt b/lib/ufe/CMakeLists.txt
@@ -121,9 +121,12 @@ target_compile_definitions(${UFE_PYTHON_TARGET_NAME}
 )
 
 # -----------------------------------------------------------------------------
-# properties
+# include directories
 # -----------------------------------------------------------------------------
-set_python_module_property(${UFE_PYTHON_TARGET_NAME})
+target_include_directories(${UFE_PYTHON_TARGET_NAME}
+    PRIVATE
+        ${CMAKE_BINARY_DIR}/include
+)
 
 # -----------------------------------------------------------------------------
 # link libraries
@@ -133,6 +136,11 @@ target_link_libraries(${UFE_PYTHON_TARGET_NAME}
         ${PROJECT_NAME}
 )
 
+# -----------------------------------------------------------------------------
+# properties
+# -----------------------------------------------------------------------------
+set_python_module_property(${UFE_PYTHON_TARGET_NAME})
+
 # -----------------------------------------------------------------------------
 # run-time search paths
 # -----------------------------------------------------------------------------

diff --git a/lib/usd/hdMaya/CMakeLists.txt b/lib/usd/hdMaya/CMakeLists.txt
@@ -58,6 +58,7 @@ target_include_directories(${TARGET_NAME}
     PRIVATE
         "${CMAKE_CURRENT_SOURCE_DIR}/.."
         $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
+        ${CMAKE_BINARY_DIR}/include
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
         "${CMAKE_CURRENT_BINARY_DIR}/.."

diff --git a/plugin/adsk/plugin/CMakeLists.txt b/plugin/adsk/plugin/CMakeLists.txt
@@ -43,7 +43,7 @@ target_compile_definitions(${TARGET_NAME}
 # -----------------------------------------------------------------------------
 target_include_directories(${TARGET_NAME}
     PRIVATE
-        ${MAYAUSD_INCLUDE_DIR}
+        ${CMAKE_BINARY_DIR}/include
         ${PXR_INCLUDE_DIRS}
         $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
 )

diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt b/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt
@@ -74,7 +74,6 @@ target_include_directories(${TARGET_NAME}
     PRIVATE
         ${GTEST_INCLUDE_DIRS}
         ${MAYA_INCLUDE_DIRS}
-        ${MAYAUSD_INCLUDE_DIR}
         "../../lib/AL_USDMaya"
         "../../schemas"
         ${MAYATEST_INCLUDE_LOCATION}