diff options
author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-13 19:21:55 +0200 |
---|---|---|
committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-13 19:21:55 +0200 |
commit | 241919e7f7986c11586a49bff53cf19c2c0e0ea6 (patch) | |
tree | dfd7f4fa971fd77c89eaaa140ba1e53b910b24aa /indra/cmake/GLOD.cmake | |
parent | 2c9ede0ccc3b6a27ca418fcb6e7a91eb87b261e9 (diff) |
Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
Diffstat (limited to 'indra/cmake/GLOD.cmake')
-rw-r--r-- | indra/cmake/GLOD.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake index 1a33644e9e..2d7f85030f 100644 --- a/indra/cmake/GLOD.cmake +++ b/indra/cmake/GLOD.cmake @@ -1,14 +1,12 @@ # -*- cmake -*- include(Prebuilt) -if( TARGET glod::glod ) - return() -endif() -create_target( glod::glod ) +include_guard() +create_target( ll::glod ) use_prebuilt_binary(glod) set(GLODLIB ON CACHE BOOL "Using GLOD library") -set_target_include_dirs( glod::glod ${LIBS_PREBUILT_DIR}/include) -set_target_libraries( glod::glod GLOD ) +set_target_include_dirs( ll::glod ${LIBS_PREBUILT_DIR}/include) +set_target_libraries( ll::glod GLOD ) |