Fixes for building with gcc 11 (still using old ABI).

Autodesk · Sep 28, 2022 · 74fd234 · 74fd234
1 parent b96f036
commit 74fd234
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake
@@ -35,6 +35,10 @@ macro(fetch_googletest)
             # Simply disable all warnings in googletest since we won't fix them anyways.
             # We will just update to newer version, if required.
             set(disable_all_warnings_flag -w)
+
+            # Force the use of ABI version 0 on Linux.
+            # This is what Maya has been using for 2019...2023
+            set(glibcxx_abi -D_GLIBCXX_USE_CXX11_ABI=0)
         endif()
 
         if (GOOGLETEST_SRC_DIR)

diff --git a/cmake/googletest_download.txt.in b/cmake/googletest_download.txt.in
@@ -27,5 +27,5 @@ ExternalProject_Add(googletest
                     "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
                     "-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}"
                     "-DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}"
-                    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${disable_all_warnings_flag}"
+                    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${disable_all_warnings_flag} ${glibcxx_abi}"
 )
diff --git a/cmake/googletest_src.txt.in b/cmake/googletest_src.txt.in
@@ -24,5 +24,5 @@ ExternalProject_Add(googletest
                     "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
                     "-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}"
                     "-DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}"
-                    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${disable_all_warnings_flag}"
+                    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${disable_all_warnings_flag} ${glibcxx_abi}"
 )
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
@@ -274,12 +274,6 @@ function(get_external_project_default_values out_var)
     # Therefore avoid useless warnings in the log.
     list(APPEND setting_list --no-warn-unused-cli)
 
-    # 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")
-        list(APPEND setting_list -D_GLIBCXX_USE_CXX11_ABI=0)
-    endif()
-
     if(ARGN)
         list(GET ARGN 0 custom_sep)
     endif()

diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp
@@ -114,7 +114,7 @@ TEST(Callback, Callback)
 //  uint32_t weight, bool isPython); EventId eventId() const;
 TEST(EventDispatcher, EventDispatcher)
 {
-    int             associated;
+    int             associated{0};
     EventDispatcher info(&g_eventSystem, "eventName", 42, kUserSpecifiedEventType, &associated, 23);
     EXPECT_EQ(info.name(), "eventName");
     EXPECT_EQ(info.eventId(), 42u);