Skip to content
Snippets Groups Projects
Commit baab17e6 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

More linking fixes

parent 725e52b7
No related branches found
No related tags found
No related merge requests found
...@@ -142,7 +142,7 @@ if (WINDOWS) ...@@ -142,7 +142,7 @@ if (WINDOWS)
endif() endif()
set(GLOBAL_CXX_FLAGS set(GLOBAL_CXX_FLAGS
"/GS /W3 /c /Zc:__cplusplus /Zc:forScope /Zc:rvalueCast /Zc:strictStrings /Zc:ternary /nologo" "/GS /W3 /c /Zc:__cplusplus /Zc:forScope /Zc:rvalueCast /Zc:strictStrings /Zc:ternary /nologo"
) )
if (USE_AVX2) if (USE_AVX2)
......
# -*- cmake -*- # -*- cmake -*-
include(Abseil)
include(Boost)
set(LLFILESYSTEM_INCLUDE_DIRS set(LLFILESYSTEM_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llfilesystem ${LIBS_OPEN_DIR}/llfilesystem
) )
set(LLFILESYSTEM_LIBRARIES llfilesystem) set(LLFILESYSTEM_LIBRARIES llfilesystem ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY} absl::strings)
...@@ -70,19 +70,20 @@ set(cache_BOOST_LIBRARIES ...@@ -70,19 +70,20 @@ set(cache_BOOST_LIBRARIES
) )
target_link_libraries(llfilesystem target_link_libraries(llfilesystem
PUBLIC
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${cache_BOOST_LIBRARIES} ${cache_BOOST_LIBRARIES}
absl::strings absl::strings
) )
if (WINDOWS) if (WINDOWS)
target_link_libraries(llfilesystem Shlwapi) target_link_libraries(llfilesystem PUBLIC Shlwapi)
endif (WINDOWS) endif (WINDOWS)
if (DARWIN) if (DARWIN)
include(CMakeFindFrameworks) include(CMakeFindFrameworks)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
target_link_libraries(llfilesystem ${COCOA_LIBRARY}) target_link_libraries(llfilesystem PUBLIC ${COCOA_LIBRARY})
endif (DARWIN) endif (DARWIN)
if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") if(${CMAKE_VERSION} VERSION_GREATER "3.15.0")
...@@ -107,7 +108,7 @@ if (LL_TESTS) ...@@ -107,7 +108,7 @@ if (LL_TESTS)
LL_ADD_PROJECT_UNIT_TESTS(llfilesystem "${llfilesystem_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llfilesystem "${llfilesystem_TEST_SOURCE_FILES}")
# INTEGRATION TESTS # INTEGRATION TESTS
set(test_libs llmath llcommon llfilesystem ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) set(test_libs llmath llcommon llfilesystem ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES} absl::strings)
# TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests. # TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests.
LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}")
......
...@@ -211,7 +211,7 @@ const std::string LLDiskCache::metaDataToFilepath(const LLUUID& id, ...@@ -211,7 +211,7 @@ const std::string LLDiskCache::metaDataToFilepath(const LLUUID& id,
{ {
std::string uuidstr = id.asString(); std::string uuidstr = id.asString();
const auto& dirdelim = gDirUtilp->getDirDelimiter(); const auto& dirdelim = gDirUtilp->getDirDelimiter();
return absl::StrCat(sCacheDir, dirdelim, absl::string_view(&uuidstr[0], 1), dirdelim, uuidstr, sCacheFilenameExt); return absl::StrCat(sCacheDir, dirdelim, std::string_view(&uuidstr[0], 1), dirdelim, uuidstr, sCacheFilenameExt);
} }
const std::string LLDiskCache::getCacheInfo() const std::string LLDiskCache::getCacheInfo()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment