Merge pull request #388 from Autodesk/sabrih/MAYA-104002/clean_up_part_1

PART I: lib directory restructure

lib/CMakeLists.txt

@@ -1,161 +1,2 @@
-#
-# Copyright 2020 Autodesk
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-project(mayaUsd)
-
-add_library(${PROJECT_NAME} SHARED)
-
-#------------------------------------------------------------------------------
-# modules and definitions
-#------------------------------------------------------------------------------
-if(NOT DEFINED BOOST_ROOT)
-    set(BOOST_ROOT ${PXR_USD_LOCATION})
-endif()
-if(MAYAUSD_DEFINE_BOOST_DEBUG_PYTHON_FLAG)
-    set(Boost_USE_DEBUG_PYTHON ON)
-endif()
-find_package(Boost COMPONENTS filesystem REQUIRED)
-
-# -----------------------------------------------------------------------------
-# compile definitions
-# -----------------------------------------------------------------------------
-target_compile_definitions(${PROJECT_NAME} 
-    PRIVATE
-        MAYAUSD_MACROS_EXPORT
-        MAYAUSD_CORE_EXPORT
-        MFB_PACKAGE_NAME="${PROJECT_NAME}"
-        MFB_ALT_PACKAGE_NAME="${PROJECT_NAME}"
-        MFB_PACKAGE_MODULE="${PROJECT_NAME}"
-        $<$<BOOL:${UFE_FOUND}>:WANT_UFE_BUILD>
-        $<$<BOOL:${IS_MACOSX}>:OSMac_>
-)
-
-# Some of the UFE classes are exporting STL classes which causes this warning.
-if(UFE_FOUND AND MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251")
-    string(REPLACE " " ";" REPLACED_FLAGS ${CMAKE_CXX_FLAGS})
-    target_compile_options(${PROJECT_NAME} INTERFACE ${REPLACED_FLAGS})
-endif()
-
-# -----------------------------------------------------------------------------
-# include directories
-# -----------------------------------------------------------------------------
-target_include_directories(${PROJECT_NAME} 
-    PUBLIC
-        ${MAYA_INCLUDE_DIRS}
-        ${PXR_INCLUDE_DIRS}
-        $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
-    PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_BINARY_DIR}/include
-)
-
-# -----------------------------------------------------------------------------
-# link libraries
-# -----------------------------------------------------------------------------
-target_link_libraries(${PROJECT_NAME}
-    PUBLIC
-        ar
-        gf
-        hd
-        hdx
-        js
-        kind
-        plug
-        sdf
-        tf
-        trace
-        usd
-        usdGeom
-        usdImaging
-        usdImagingGL
-        usdLux
-        usdRi
-        usdShade
-        usdSkel
-        usdUtils
-        vt
-        $<$<BOOL:${UFE_FOUND}>:${UFE_LIBRARY}>
-        ${MAYA_LIBRARIES}
-    PRIVATE
-        Boost::filesystem
-        Boost::system
-)
-
-# -----------------------------------------------------------------------------
-# run-time search paths
-# -----------------------------------------------------------------------------
-if(IS_MACOSX OR IS_LINUX)
-    mayaUsd_init_rpath(rpath "lib")
-    if(DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
-        mayaUsd_add_rpath(rpath "../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib")
-    elseif(DEFINED PXR_USD_LOCATION)
-        mayaUsd_add_rpath(rpath "${PXR_USD_LOCATION}/lib")
-    endif()
-    if (IS_LINUX AND DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
-        mayaUsd_add_rpath(rpath "../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib64")
-    endif()
-    if(IS_MACOSX AND DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
-        mayaUsd_add_rpath(rpath "../../../Maya.app/Contents/MacOS")
-    endif()
-    mayaUsd_install_rpath(rpath ${PROJECT_NAME})
-endif()
-
-# -----------------------------------------------------------------------------
-# install
-# -----------------------------------------------------------------------------
-install(TARGETS ${PROJECT_NAME}
-    LIBRARY
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-    ARCHIVE
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-    RUNTIME
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-if(IS_WINDOWS)
-    install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> 
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL
-    )
-endif()
-
-#install top level plugInfo.json that includes the configured plugInfo.json
-install(CODE
-    "file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/lib/usd/plugInfo.json\" \"{\n    \\\"Includes\\\": [ \\\"*/resources/\\\" ]\n}\")"
-)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib/usd/plugInfo.json
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/usd
-)
-
-# -----------------------------------------------------------------------------
-# subdirectories
-# -----------------------------------------------------------------------------
-add_subdirectory(ae)
-add_subdirectory(base)
-add_subdirectory(fileio)
-add_subdirectory(listeners)
-add_subdirectory(nodes)
-add_subdirectory(python)
-add_subdirectory(render)
-if(UFE_FOUND)
-    add_subdirectory(ufe)
-endif()
-add_subdirectory(usd)
-add_subdirectory(utils)
-
-if(BUILD_HDMAYA)
-    add_subdirectory(render/mayaToHydra)
-    add_dependencies(mtoh hdMaya)
-endif()
+add_subdirectory(mayaUsd)
+add_subdirectory(usd)