Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Boudrey/maya 113815/centos8 #1716

Merged
merged 4 commits into from
Sep 21, 2021
Merged

Boudrey/maya 113815/centos8 #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea7fb82
MAYA-113815 Build Maya on CentOS 8
boudrey Sep 20, 2021
501d01c
unused variable fix.
boudrey Sep 20, 2021
03b4d2a
clang-format fix
boudrey Sep 21, 2021
9b70a04
Using if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") instead of if(UNIX AN…
boudrey Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cmake/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ macro(fetch_googletest)
# Attempting to do so in execute_process fails with string invalid escape
# sequence parsing errors. PPT, 22-Nov-2018.
file(TO_CMAKE_PATH ${CMAKE_MAKE_PROGRAM} CMAKE_MAKE_PROGRAM)

# Force the use of ABI version 0 on Linux.
# This is what Maya has been using for 2019...2023
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(FORCE_OLD_ABI "-D_GLIBCXX_USE_CXX11_ABI=0")
endif()

if (GOOGLETEST_SRC_DIR)
configure_file(cmake/googletest_src.txt.in ${GOOGLETEST_BUILD_ROOT}/googletest-config/CMakeLists.txt)
else()
Expand Down
11 changes: 1 addition & 10 deletions cmake/googletest_download.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(FORCE_SHARED_CRT "")
set(FORCE_OLD_ABI "")
if(MSVC)
set(FORCE_SHARED_CRT "-DFORCE_SHARED_CRT=OFF")
seando-adsk marked this conversation as resolved.
Show resolved Hide resolved
elseif(UNIX AND NOT APPLE)
set(FORCE_OLD_ABI "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()

ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.10.0
Expand All @@ -36,9 +28,8 @@ ExternalProject_Add(googletest
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_MACOSX_RPATH=ON"
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
"${FORCE_SHARED_CRT}"
"-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
"-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}"
"-DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}"
"${FORCE_OLD_ABI}"
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${FORCE_OLD_ABI}"
)
11 changes: 1 addition & 10 deletions cmake/googletest_src.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(FORCE_SHARED_CRT "")
set(FORCE_OLD_ABI "")
if(MSVC)
set(FORCE_SHARED_CRT "-DFORCE_SHARED_CRT=OFF")
elseif(UNIX AND NOT APPLE)
set(FORCE_OLD_ABI "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()

ExternalProject_Add(googletest
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
Expand All @@ -33,9 +25,8 @@ ExternalProject_Add(googletest
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_MACOSX_RPATH=ON"
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
"${FORCE_SHARED_CRT}"
"-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
"-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}"
"-DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}"
"${FORCE_OLD_ABI}"
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${FORCE_OLD_ABI}"
)
6 changes: 5 additions & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,9 @@ void ProxyRenderDelegate::_Execute(const MHWRender::MFrameContext& frameContext)
HdReprSelector reprSelector;

const bool inSelectionPass = (frameContext.getSelectionInfo() != nullptr);
#if !defined(MAYA_NEW_POINT_SNAPPING_SUPPORT) || defined(WANT_UFE_BUILD)
const bool inPointSnapping = pointSnappingActive();
#endif

#if defined(WANT_UFE_BUILD)
// Query selection adjustment and kind only if the update is triggered in a selection pass.
Expand All @@ -765,11 +767,13 @@ void ProxyRenderDelegate::_Execute(const MHWRender::MFrameContext& frameContext)
}
#endif // defined(WANT_UFE_BUILD)

#else // !defined(MAYA_ENABLE_UPDATE_FOR_SELECTION)
#else // !defined(MAYA_ENABLE_UPDATE_FOR_SELECTION)
HdReprSelector reprSelector = kPointsReprSelector;

constexpr bool inSelectionPass = false;
#if !defined(MAYA_NEW_POINT_SNAPPING_SUPPORT)
constexpr bool inPointSnapping = false;
#endif
#endif // defined(MAYA_ENABLE_UPDATE_FOR_SELECTION)

#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
Expand Down