diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-16 19:55:58 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-16 19:55:58 +0200 |
| commit | 0eb2d8056a9d7c858545987cec74a4d604dcd5b5 (patch) | |
| tree | ecc6148b9587c914b43d6176947aec4813783c26 | |
| parent | 9b34575ba829fd082a301f6b210b472cfb948c2a (diff) | |
Pull in LL_GLOD=1 via target, not by hand crafted magic.
| -rw-r--r-- | indra/cmake/GLOD.cmake | 3 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake index 2d7f85030f..ab7eb38862 100644 --- a/indra/cmake/GLOD.cmake +++ b/indra/cmake/GLOD.cmake @@ -6,7 +6,6 @@ create_target( ll::glod ) use_prebuilt_binary(glod) -set(GLODLIB ON CACHE BOOL "Using GLOD library") - set_target_include_dirs( ll::glod ${LIBS_PREBUILT_DIR}/include) set_target_libraries( ll::glod GLOD ) +target_compile_definitions( ll::glod INTERFACE LL_GLOD=1)
\ No newline at end of file diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4a143bb4d8..018314bca6 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1658,10 +1658,6 @@ if( DEFINED LLSTARTUP_COMPILE_FLAGS ) set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") endif() -if (GLODLIB) - set_source_files_properties(llfloatermodelpreview.cpp PROPERTIES COMPILE_FLAGS "-DLL_GLOD") -endif (GLODLIB) - list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) set_source_files_properties(${viewer_HEADER_FILES} |