diff options
author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-03-31 10:54:22 -0700 |
---|---|---|
committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-03-31 10:54:22 -0700 |
commit | 4e306c90666094a7450f4d6f3ed7c8b71527e393 (patch) | |
tree | 4e52cfe3cfc7df8060ec5336f53d91636986b43c /indra/cmake/Havok.cmake | |
parent | b44ad50f75724a5d9e53bd52d2724111568caf24 (diff) | |
parent | 7d144fcb2a1b0aff1b59e378c652649c3d03e94f (diff) |
Merge branch 'DRTVWR-559' of https://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) |