diff options
author | Dave Parks <davep@lindenlab.com> | 2023-03-31 11:57:48 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2023-03-31 11:57:48 -0500 |
commit | 7d144fcb2a1b0aff1b59e378c652649c3d03e94f (patch) | |
tree | de3bfe3ce90677cc4d7ab25b8aeaf5853c009068 /indra/cmake/Havok.cmake | |
parent | 0fe09bd968b987605123e99efb2fa040a988a942 (diff) | |
parent | e4173ea5cc1ef9b1677ac87a0f7c8acbe73414ee (diff) |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/cmake/Havok.cmake')
-rw-r--r-- | indra/cmake/Havok.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 811a126b8f..652760e626 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -1,7 +1,6 @@ # -*- cmake -*- include(Prebuilt) -if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) -set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") +include_guard() use_prebuilt_binary(havok-source) @@ -124,4 +123,3 @@ foreach(HAVOK_LIB ${HAVOK_LIBS}) endif (LINUX) endforeach(HAVOK_LIB) -endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) |