diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 1857547616..da416b4b82 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -216,49 +216,6 @@ function(mayaUsd_get_unittest_target unittest_target unittest_basename) set(${unittest_target} "${unittest_name}" PARENT_SCOPE) endfunction() -function(mayaUsd_promoteHeaderListWithSubdir) - cmake_parse_arguments(PREFIX - "" - "SUBDIR" # one_value keywords - "HEADERS;BASE_PATH" # multi_value keywords - ${ARGN} - ) - - if (PREFIX_HEADERS) - set(headerFiles ${PREFIX_HEADERS}) - else() - message(FATAL_ERROR "HEADERS keyword is not specified.") - endif() - - set(basePath ${CMAKE_BINARY_DIR}/include) - if (PREFIX_BASE_PATH) - set(basePath ${basePath}/${PREFIX_BASE_PATH}) - else() - set(basePath ${basePath}/mayaUsd) - endif() - - if (PREFIX_SUBDIR) - set(basePath ${basePath}/${PREFIX_SUBDIR}) - endif() - - foreach(header ${headerFiles}) - set(srcFile ${CMAKE_CURRENT_SOURCE_DIR}/${header}) - set(dstFile ${basePath}/${header}) - - set(content "#pragma once\n#include \"${srcFile}\"\n") - - if (NOT EXISTS ${dstFile}) - message(STATUS "promoting: " ${srcFile}) - file(WRITE ${dstFile} "${content}") - else() - file(READ ${dstFile} oldContent) - if (NOT "${content}" STREQUAL "${oldContent}") - message(STATUS "Promoting ${srcfile}") - file(WRITE ${dstFile} "${content}") - endif() - endif() - endforeach() -endfunction() # # mayaUsd_copyFiles( # [DESTINATION ] diff --git a/lib/usd/utils/CMakeLists.txt b/lib/usd/utils/CMakeLists.txt index edb7f114b5..f1bc2d916e 100644 --- a/lib/usd/utils/CMakeLists.txt +++ b/lib/usd/utils/CMakeLists.txt @@ -50,10 +50,11 @@ set(headers SIMD.h ) -mayaUsd_promoteHeaderListWithSubdir( - HEADERS +mayaUsd_promoteHeaderList( + HEADERS ${headers} - BASE_PATH ${TARGET_NAME} + BASEDIR + ${TARGET_NAME} ) # -----------------------------------------------------------------------------