diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py index 5d3861d0aa..b03d8c7ef4 100644 --- a/build_scripts/build_usd.py +++ b/build_scripts/build_usd.py @@ -1702,8 +1702,10 @@ def InstallUSD(context, force, buildArgs): if context.buildDebug: extraArgs.append('-DTBB_USE_DEBUG_BUILD=ON') + extraArgs.append('-DPXR_USE_DEBUG_BUILD=ON') else: extraArgs.append('-DTBB_USE_DEBUG_BUILD=OFF') + extraArgs.append('-DPXR_USE_DEBUG_BUILD=OFF') if context.buildDocs: extraArgs.append('-DPXR_BUILD_DOCUMENTATION=ON') diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake index 639a01cf1f..cd77c50a3a 100644 --- a/cmake/modules/FindOpenEXR.cmake +++ b/cmake/modules/FindOpenEXR.cmake @@ -68,10 +68,16 @@ foreach(OPENEXR_LIB # OpenEXR libraries may be suffixed with the version number, so we search # using both versioned and unversioned names. + set(DEBUG_POSTFIX ) + if(DEFINED PXR_USE_DEBUG_BUILD) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND ${PXR_USE_DEBUG_BUILD} MATCHES ON) + set(DEBUG_POSTFIX _d) + endif() + endif() find_library(OPENEXR_${OPENEXR_LIB}_LIBRARY NAMES - ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION} - ${OPENEXR_LIB} + ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}${DEBUG_POSTFIX} + ${OPENEXR_LIB}{DEBUG_POSTFIX} HINTS "${OPENEXR_LOCATION}" "$ENV{OPENEXR_LOCATION}" diff --git a/cmake/modules/FindOpenImageIO.cmake b/cmake/modules/FindOpenImageIO.cmake index 9df47ff23f..aab8adec0f 100644 --- a/cmake/modules/FindOpenImageIO.cmake +++ b/cmake/modules/FindOpenImageIO.cmake @@ -30,8 +30,14 @@ if(UNIX) "$ENV{OIIO_LOCATION}" "/opt/oiio" ) + set(LIBNAME libOpenImageIO.so) + if(if DEFINED PXR_USE_DEBUG_BUILD) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND ${PXR_USE_DEBUG_BUILD} MATCHES ON) + set(LIBNAME libOpenImageIO_d.dylib) + endif() + endif() find_path(OIIO_LIBRARY_DIR - libOpenImageIO.so + ${LIBNAME} HINTS "${OIIO_LOCATION}" "$ENV{OIIO_LOCATION}" @@ -74,10 +80,15 @@ find_path(OIIO_INCLUDE_DIR ) list(APPEND OIIO_INCLUDE_DIRS ${OIIO_INCLUDE_DIR}) - +set(DEBUG_POSTFIX ) +if(if DEFINED PXR_USE_DEBUG_BUILD) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND ${PXR_USE_DEBUG_BUILD} MATCHES ON) + set(DEBUG_POSTFIX _d) + endif() +endif() foreach(OIIO_LIB - OpenImageIO - OpenImageIO_Util + OpenImageIO${DEBUG_POSTFIX} + OpenImageIO_Util${DEBUG_POSTFIX} ) find_library(OIIO_${OIIO_LIB}_LIBRARY