From c8b4f284fac39e45d5795593954c77279181a804 Mon Sep 17 00:00:00 2001 From: Luca Scheller Date: Thu, 21 Mar 2024 00:24:37 -0700 Subject: [PATCH] Re-enable old Houdini ABI --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0696fb..e0ff36f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,14 +197,14 @@ else() # Notes: # Houdini 20 - Switched to the new C++11 ABI for Linux https://www.sidefx.com/docs/houdini/news/20/platforms.html # For Houdini versions that use gcc 9.3, please set this to _GLIBCXX_USE_CXX11_ABI=0 - #file(REAL_PATH ${AR_HOUDINI_ROOT} AR_HOUDINI_ROOT_RESOLVED) - #string(FIND ${AR_HOUDINI_ROOT_RESOLVED} "19.5" AR_HOUDINI_ROOT_IS_H195) - #if (${AR_HOUDINI_ROOT_IS_H195} STREQUAL "-1") - # add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=1) - #else() - # message("Houdini 19.5 detected, switching to _GLIBCXX_USE_CXX11_ABI=0") - # add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0) - #endif() + file(REAL_PATH ${AR_HOUDINI_ROOT} AR_HOUDINI_ROOT_RESOLVED) + string(FIND ${AR_HOUDINI_ROOT_RESOLVED} "19.5" AR_HOUDINI_ROOT_IS_H195) + if (${AR_HOUDINI_ROOT_IS_H195} STREQUAL "-1") + add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=1) + else() + message("Houdini 19.5 detected, switching to _GLIBCXX_USE_CXX11_ABI=0") + add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0) + endif() endif() # Compiler Options # This is the same as set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHBOOST_ALL_NO_LIB -D_GLIBCXX_USE_CXX11_ABI=0")