livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port new cmake files (Trace/Meshoptimizer) to modern cmake

master
Nicky 2022-06-05 16:15:55 +02:00
parent 59f6062685
commit c08a61453b
8 changed files with 35 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/cmake/CMakeLists.txt
View File

@ -37,7 +37,6 @@ set(cmake_SOURCE_FILES
LLCommon.cmake
LLImage.cmake
LLKDU.cmake
LLMeshOptimizer.cmake
LLPhysicsExtensions.cmake
LLPrimitive.cmake
LLSharedLibs.cmake

7
indra/cmake/LLMeshOptimizer.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLMESHOPTIMIZER_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llmeshoptimizer
)
set(LLMESHOPTIMIZER_LIBRARIES llmeshoptimizer)

13
indra/cmake/MESHOPTIMIZER.cmake
View File

@ -3,14 +3,19 @@
include(Linking)
include(Prebuilt)
include_guard()
add_library( ll::meshoptimizer INTERFACE IMPORTED )
use_conan_binary(meshoptimizer)
use_prebuilt_binary(meshoptimizer)
if (WINDOWS)
set(MESHOPTIMIZER_LIBRARIES meshoptimizer.lib)
target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
set(MESHOPTIMIZER_LIBRARIES )
elseif (LINUX)
set(MESHOPTIMIZER_LIBRARIES meshoptimizer.o)
target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.o)
elseif (DARWIN)
set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.a)
target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
endif (WINDOWS)
set(MESHOPTIMIZER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
target_include_directories( ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)

25
indra/cmake/Tracy.cmake
View File

@ -1,29 +1,18 @@
# -*- cmake -*-
include(Prebuilt)
include_guard()
add_library( ll::tracy INTERFACE IMPORTED )
set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
if (USE_TRACY)
set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
# See: indra/llcommon/llprofiler.h
add_definitions(-DLL_PROFILER_CONFIGURATION=3)
use_conan_binary(tracy)
use_prebuilt_binary(tracy)
if (WINDOWS)
MESSAGE(STATUS "Including Tracy for Windows: '${TRACY_INCLUDE_DIR}'")
endif (WINDOWS)
target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
if (DARWIN)
MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'")
endif (DARWIN)
if (LINUX)
MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'")
endif (LINUX)
else (USE_TRACY)
# Tracy.cmake should not set LLCOMMON_INCLUDE_DIRS, let LLCommon.cmake do that
set(TRACY_INCLUDE_DIR "")
set(TRACY_LIBRARY "")
# See: indra/llcommon/llprofiler.h
target_compile_definitions(ll::tracy INTERFACE LL_PROFILER_CONFIGURATION=3 )
endif (USE_TRACY)

1
indra/cmake/UI.cmake
View File

@ -44,6 +44,7 @@ if( WINDOWS )
Vfw32
wer
winspool
imm32
)
endif()

38
indra/llmeshoptimizer/CMakeLists.txt
View File

@ -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_LIBRARIES}
${LLMATH_LIBRARIES}
${MESHOPTIMIZER_LIBRARIES})
# Add tests
target_link_libraries(llmeshoptimizer
llcommon
llmath
ll::meshoptimizer)
# Add tests
#endif (USE_MESHOPT)

6
indra/llui/CMakeLists.txt
View File

@ -280,10 +280,6 @@ if(LL_TESTS)
if(NOT LINUX)
set(test_libs llui llmessage llcorehttp llxml llrender llcommon ll::hunspell )
if(WINDOWS)
LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "imm32;${test_libs}")
else(WINDOWS)
LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}")
endif(WINDOWS)
LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}")
endif(NOT LINUX)
endif(LL_TESTS)

6
indra/newview/CMakeLists.txt
View File

@ -27,7 +27,7 @@ include(LLCommon)
include(LLCoreHttp)
include(LLImage)
include(LLKDU)
include(LLMeshOptimizer)
include(MESHOPTIMIZER)
include(LLPhysicsExtensions)
include(LLPrimitive)
include(LLWindow)
@ -1884,7 +1884,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
llmath
llcorehttp
llcommon
ll::glod
llmeshoptimizer
ll::ndof
ll::uilibraries
lllogin
@ -1892,7 +1892,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
llappearance
${LLPHYSICSEXTENSIONS_LIBRARIES}
ll::bugsplat
${TRACY_LIBRARY}
ll::tracy
)
if( TARGET ll::intel_memops )