From 0edd174dece215446a93a041a6e134038ff9cbe9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 30 Apr 2020 12:30:50 +0200 Subject: [PATCH] Turn HAVOK_TPV off and switch to HACD in case somebody tries a Havok build on Linux --- indra/cmake/Variables.cmake | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 4046ca21bc..a4f7e1e0e5 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -227,13 +227,18 @@ set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.") # When using Havok, we have to turn OpenSim support off -if( HAVOK_TPV ) - if( OPENSIM ) - message( "compiling with Havok libraries, disabling OpenSim support" ) - endif( OPENSIM ) - - set( OPENSIM OFF ) -endif( HAVOK_TPV ) +if (HAVOK_TPV) + if (OPENSIM) + message("compiling with Havok libraries, disabling OpenSim support") + endif (OPENSIM) + + if (LINUX) + message("compiling with Havok libraries is not supported on Linux - switching to HACD") + set(HAVOK_TPV OFF) + endif (LINUX) + + set(OPENSIM OFF) +endif (HAVOK_TPV) # source_group("CMake Rules" FILES CMakeLists.txt)