diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 541ceda322..d164e69c6f 100644 --- 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} $<$:${UFE_INCLUDE_DIR}> PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include ) # ----------------------------------------------------------------------------- diff --git a/lib/python/CMakeLists.txt b/lib/python/CMakeLists.txt index c0f2a89cee..314a8caf16 100644 --- 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 index 413cc73d8f..f27af1bac9 100644 --- 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 $<$:${UFE_INCLUDE_DIR}> ) diff --git a/lib/ufe/CMakeLists.txt b/lib/ufe/CMakeLists.txt index 470c5f5a2d..b505960710 100644 --- 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 index c4029da488..f309b271c4 100644 --- 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}/.." $<$:${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 index 653bd0702a..352a4ef731 100644 --- 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} $<$:${UFE_INCLUDE_DIR}> ) diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt b/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt index 5a3be8467a..70b1599f43 100644 --- 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}