diff --git a/CMakeLists.txt b/CMakeLists.txt index 84a5e46..6e102ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) -set (CMAKE_CXX_STANDARD 11) +set (CMAKE_CXX_STANDARD 14) project(usd-renderman) @@ -11,6 +11,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${KATANA_HOME}/plugins/Src/cmake" ) +set(KATANA_RESOURCES "$ENV{KATANA_RESOURCES}") + find_package(Katana PATHS "${KATANA_HOME}/plugin_apis/cmake" REQUIRED) # Ensure we don't compile DSOs with undefined symbols. diff --git a/katana/CMakeLists.txt b/katana/CMakeLists.txt index 1208957..4ef3a45 100644 --- a/katana/CMakeLists.txt +++ b/katana/CMakeLists.txt @@ -1,14 +1,14 @@ set(PLUGIN_NAME usd_renderman_katana) -set(USD_KATANA_LIBRARY_DIR $ENV{REZ_KATANAUSDPLUGINS_ROOT}/third_party/katana/lib/usd/libs) -set(USD_KATANA_INCLUDE_DIR $ENV{REZ_KATANAUSDPLUGINS_ROOT}/third_party/katana/include) +set(USD_KATANA_LIBRARY_DIR $ENV{REZ_KATANAUSDPLUGINS_ROOT}/lib) +set(USD_KATANA_INCLUDE_DIR $ENV{REZ_KATANAUSDPLUGINS_ROOT}/include) set(RENDERMAN_INCLUDE_DIR $ENV{RMANTREE}/include) set(RENDERMAN_LIBRARY $ENV{RMANTREE}/lib) set(USD_LIBRARY_DIR $ENV{KATANA_API_LOCATION}/bin) set(USD_INCLUDE_DIR $ENV{KATANA_API_LOCATION}/external/FnUSD/include) -set(PXR_LIB_PREFIX libFn) +set(PXR_LIB_PREFIX libfn) find_package(USD REQUIRED) set(GEOLIB_API_SOURCE_DIR ${KATANA_API_SOURCE_DIR}) @@ -26,8 +26,9 @@ find_package(Boost COMPONENTS filesystem serialization - python + python27 system + thread REQUIRED ) @@ -72,12 +73,12 @@ target_link_libraries(${PLUGIN_NAME} Katana::FnAttribute Katana::FnGeolibOpPlugin Katana::FnGeolibServices - Fntf - Fngf - Fnsdf - Fnusd - FnusdGeom - FnusdVol + fntf + fngf + fnsdf + fnusd + fnusdGeom + fnusdVol usdKatana ) diff --git a/package.py b/package.py index 009835c..8bc02c5 100644 --- a/package.py +++ b/package.py @@ -2,7 +2,7 @@ name = 'usd_renderman' -version = '1.0.2' +version = '2.0.0' authors = ['ben.skinner', 'daniel.flood', 'jonah.newton'] @@ -15,9 +15,7 @@ ] variants = [ - ['platform-linux', 'arch-x86_64', 'katana-3.6.2', 'rfk-23.5', 'renderman-23.5'], - ['platform-linux', 'arch-x86_64', 'katana-3.6.2', 'rfk-24', 'renderman-24'], - ['platform-linux', 'arch-x86_64', 'katana-3.6.2', 'rfk-24', 'renderman-24.4'] + ['platform-linux', 'arch-x86_64', 'katana-4.5.2', 'rfk-24.4', 'renderman-24.4'] ] def commands(): diff --git a/rez-build.sh b/rez-build.sh new file mode 100755 index 0000000..dea8136 --- /dev/null +++ b/rez-build.sh @@ -0,0 +1,7 @@ +#! /bin/bash + +export CC=/opt/rh/devtoolset-7/root/bin/gcc +export CXX=/opt/rh/devtoolset-7/root/bin/g++ + +# this will build and install the rez package locally (default is ~/packages) +rez-build -i diff --git a/rez-release.sh b/rez-release.sh new file mode 100755 index 0000000..9fe2af5 --- /dev/null +++ b/rez-release.sh @@ -0,0 +1,7 @@ +#! /bin/bash + +export CC=/opt/rh/devtoolset-7/root/bin/gcc +export CXX=/opt/rh/devtoolset-7/root/bin/g++ + +# this will release the rez package +rez-release