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

Now there is a oslibrary target get rid of some more obsolete vars: 

LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
master
Nicky 2022-04-16 15:33:32 +02:00
parent bb85651d98
commit b9f94c0897
9 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/CMakeLists.txt
View File

@ -17,10 +17,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(Variables)
include(BuildVersion)
set(LEGACY_STDIO_LIBS)
if (WINDOWS)
set(LEGACY_STDIO_LIBS legacy_stdio_definitions)
endif (WINDOWS)
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING

2
indra/cmake/LLAddBuildTest.cmake
View File

@ -204,10 +204,8 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
)
SET(libraries
${LEGACY_STDIO_LIBS}
${library_dependencies}
ll::googlemock
${PTHREAD_LIBRARY}
)
# Add test executable build target

2
indra/cmake/Linking.cmake
View File

@ -88,7 +88,7 @@ else()
find_library(AGL_LIBRARY AGL)
find_library(APPKIT_LIBRARY AppKit)
find_library(COREAUDIO_LIBRARY CoreAudio)
set_target_libraries( ll::oslibraries
${COCOA_LIBRARY}
${IOKIT_LIBRARY}

1
indra/integration_tests/llimage_libtest/CMakeLists.txt
View File

@ -51,7 +51,6 @@ set_target_properties(llimage_libtest
# Libraries on which this application depends on
# Sort by high-level to low-level
target_link_libraries(llimage_libtest
${LEGACY_STDIO_LIBS}
llcommon
llfilesystem
llmath

1
indra/integration_tests/llui_libtest/CMakeLists.txt
View File

@ -60,7 +60,6 @@ add_executable(llui_libtest ${llui_libtest_SOURCE_FILES})
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
target_link_libraries(llui_libtest
${LEGACY_STDIO_LIBS}
llui
llinventory
llmessage

1
indra/llcorehttp/CMakeLists.txt
View File

@ -185,7 +185,6 @@ endif (DARWIN)
)
set(example_libs
${LEGACY_STDIO_LIBS}
llcorehttp
llmessage
llcommon

1
indra/llplugin/slplugin/CMakeLists.txt
View File

@ -46,7 +46,6 @@ set_target_properties(SLPlugin
endif ()
target_link_libraries(SLPlugin
${LEGACY_STDIO_LIBS}
llplugin
llmessage
llcommon

1
indra/newview/CMakeLists.txt
View File

@ -1937,7 +1937,6 @@ endif (WINDOWS)
# modern version.
target_link_libraries(${VIEWER_BINARY_NAME}
${LEGACY_STDIO_LIBS}
llaudio
llcharacter
llimage

2
indra/test/CMakeLists.txt
View File

@ -65,8 +65,6 @@ if (USE_BUGSPLAT)
endif (USE_BUGSPLAT)
target_link_libraries(lltest
${LEGACY_STDIO_LIBS}
${LLDATABASE_LIBRARIES}
llinventory
llmessage
llmath