diff options
author | Nicky Dasmijn <nicky.dasmijn@posteo.nl> | 2022-09-16 23:15:49 +0200 |
---|---|---|
committer | Nicky Dasmijn <nicky.dasmijn@posteo.nl> | 2022-09-16 23:15:49 +0200 |
commit | 0710d95f4b6b1a1c9ce242e7ce0aa7e828e6fdc1 (patch) | |
tree | 14f280cb1d3a8d1c2b6404642f4c0fd3185466dd /indra/llmeshoptimizer/CMakeLists.txt | |
parent | f08f20db5f9936956c2210b73011f7e2ff45af03 (diff) | |
parent | 6fdd35d500113b6a9d3f4b15342a1baf1e15fa7c (diff) |
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
Diffstat (limited to 'indra/llmeshoptimizer/CMakeLists.txt')
-rw-r--r-- | indra/llmeshoptimizer/CMakeLists.txt | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/indra/llmeshoptimizer/CMakeLists.txt b/indra/llmeshoptimizer/CMakeLists.txt index 016794cfad..47cb424feb 100644 --- a/indra/llmeshoptimizer/CMakeLists.txt +++ b/indra/llmeshoptimizer/CMakeLists.txt @@ -8,37 +8,27 @@ include(00-Common) include(LLCommon) include(LLMath) -include_directories( - ${LLCOMMON_INCLUDE_DIRS} - ${LLMATH_INCLUDE_DIRS} - ${LLMESHOPTIMIZER_INCLUDE_DIR} - ${MESHOPTIMIZER_INCLUDE_DIRS} - ${LIBS_PREBUILT_DIR}/include #access to boost headers, needed for LLError - ) - set(llmeshoptimizer_SOURCE_FILES - llmeshoptimizer.cpp - ) + llmeshoptimizer.cpp + ) set(llmeshoptimizer_HEADER_FILES - CMakeLists.txt - - llmeshoptimizer.h - ) + CMakeLists.txt + llmeshoptimizer.h + ) set_source_files_properties(${llmeshoptimizer_HEADER_FILES} - PROPERTIES HEADER_FILE_ONLY TRUE) + PROPERTIES HEADER_FILE_ONLY TRUE) list(APPEND llmeshoptimizer_SOURCE_FILES ${llmeshoptimizer_HEADER_FILES}) -#if (USE_MESHOPT) - add_library (llmeshoptimizer ${llmeshoptimizer_SOURCE_FILES}) +add_library (llmeshoptimizer ${llmeshoptimizer_SOURCE_FILES}) +target_include_directories( llmeshoptimizer INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(llmeshoptimizer + llcommon + llmath + ll::meshoptimizer) - target_link_libraries(llmeshoptimizer - ${LLCOMMON_LIBRARIES} - ${LLMATH_LIBRARIES} - ${MESHOPTIMIZER_LIBRARIES}) - - # Add tests +# Add tests -#endif (USE_MESHOPT) |