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

Remove function create_target and instead directly use add_library

master
Nicky 2022-04-17 18:28:55 +02:00
parent e0cf0cdfd4
commit 363f2df4fa
34 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/APR.cmake
View File

@ -3,7 +3,7 @@ include(Prebuilt)
include_guard()
create_target( ll::apr)
add_library( ll::apr INTERFACE IMPORTED )
use_prebuilt_binary(apr_suite)
if (WINDOWS)

2
indra/cmake/Audio.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target(ll::vorbis)
add_library( ll::vorbis INTERFACE IMPORTED )
use_prebuilt_binary(ogg_vorbis)
target_include_directories( ll::vorbis SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )

2
indra/cmake/Boost.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::boost )
add_library( ll::boost INTERFACE IMPORTED )
use_prebuilt_binary(boost)

2
indra/cmake/CEFPlugin.cmake
View File

@ -3,7 +3,7 @@ include(Linking)
include(Prebuilt)
include_guard()
create_target( ll::cef )
add_library( ll::cef INTERFACE IMPORTED )
use_prebuilt_binary(dullahan)
target_include_directories( ll::cef SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/cef)

2
indra/cmake/CURL.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target(ll::libcurl)
add_library( ll::libcurl INTERFACE IMPORTED )
use_prebuilt_binary(curl)
if (WINDOWS)

2
indra/cmake/EXPAT.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::expat INTERFACE IMPORTED )
add_library( ll::expat INTERFACE IMPORTED )
use_prebuilt_binary(expat)
if (WINDOWS)

2
indra/cmake/FMODSTUDIO.cmake
View File

@ -17,7 +17,7 @@ if(FMODSTUDIO)
endif()
if (USE_FMODSTUDIO)
create_target( ll::fmodstudio )
add_library( ll::fmodstudio INTERFACE IMPORTED )
target_compile_definitions( ll::fmodstudio INTERFACE LL_FMODSTUDIO=1)
if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)

2
indra/cmake/FreeType.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::freetype)
add_library( ll::freetype INTERFACE IMPORTED )
use_prebuilt_binary(freetype)
target_include_directories( ll::freetype SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/freetype2/)

2
indra/cmake/GLOD.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::glod )
add_library( ll::glod INTERFACE IMPORTED )
use_prebuilt_binary(glod)

2
indra/cmake/GoogleMock.cmake
View File

@ -6,7 +6,7 @@ include_guard()
use_prebuilt_binary(googlemock)
create_target( ll::googlemock )
add_library( ll::googlemock INTERFACE IMPORTED )
target_include_directories( ll::googlemock SYSTEM INTERFACE
${LIBS_PREBUILT_DIR}/include
)

2
indra/cmake/Hunspell.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::hunspell )
add_library( ll::hunspell INTERFACE IMPORTED )
use_prebuilt_binary(libhunspell)
if (WINDOWS)

2
indra/cmake/JPEG.cmake
View File

@ -4,7 +4,7 @@ include(Prebuilt)
include(Linking)
include_guard()
create_target(ll::jpeglib)
add_library( ll::jpeglib INTERFACE IMPORTED )
use_prebuilt_binary(jpeglib)
if (LINUX)

2
indra/cmake/JsonCpp.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::jsoncpp)
add_library( ll::jsoncpp INTERFACE IMPORTED )
use_prebuilt_binary(jsoncpp)
if (WINDOWS)

2
indra/cmake/LLKDU.cmake
View File

@ -8,7 +8,7 @@ if (INSTALL_PROPRIETARY)
endif (INSTALL_PROPRIETARY)
include_guard()
create_target( ll::kdu )
add_library( ll::kdu INTERFACE IMPORTED )
if (USE_KDU)
include(Prebuilt)

2
indra/cmake/LLPhysicsExtensions.cmake
View File

@ -11,7 +11,7 @@ if (INSTALL_PROPRIETARY)
endif (INSTALL_PROPRIETARY)
include_guard()
create_target(llphysicsextensions)
add_library( llphysicsextensions INTERFACE IMPORTED )
# Note that the use_prebuilt_binary macros below do not in fact include binaries;

8
indra/cmake/LLPrimitive.cmake
View File

@ -11,24 +11,24 @@ use_prebuilt_binary(minizip-ng) # needed for colladadom
use_prebuilt_binary(pcre)
use_prebuilt_binary(libxml2)
create_target( ll::pcre )
add_library( ll::pcre INTERFACE IMPORTED )
target_link_libraries( ll::pcre INTERFACE pcrecpp pcre )
create_target( ll::minizip-ng )
add_library( ll::minizip-ng INTERFACE IMPORTED )
if (WINDOWS)
target_link_libraries( ll::minizip-ng INTERFACE libminizip )
else()
target_link_libraries( ll::minizip-ng INTERFACE minizip )
endif()
create_target( ll::libxml )
add_library( ll::libxml INTERFACE IMPORTED )
if (WINDOWS)
target_link_libraries( ll::libxml INTERFACE libxml2_a)
else()
target_link_libraries( ll::libxml INTERFACE xml2)
endif()
create_target( ll::colladadom )
add_library( ll::colladadom INTERFACE IMPORTED )
target_include_directories( ll::colladadom SYSTEM INTERFACE
${LIBS_PREBUILT_DIR}/include/collada
${LIBS_PREBUILT_DIR}/include/collada/1.4

2
indra/cmake/LLWindow.cmake
View File

@ -5,7 +5,7 @@ include(GLEXT)
include(Prebuilt)
include_guard()
create_target(ll::sdl)
add_library( ll::sdl INTERFACE IMPORTED )
if (LINUX)
use_prebuilt_binary(SDL)

2
indra/cmake/LibVLCPlugin.cmake
View File

@ -3,7 +3,7 @@ include(Linking)
include(Prebuilt)
include_guard()
create_target( ll::libvlc )
add_library( ll::libvlc INTERFACE IMPORTED )
use_prebuilt_binary(vlc-bin)
set(LIBVLCPLUGIN ON CACHE BOOL

2
indra/cmake/Linking.cmake
View File

@ -55,7 +55,7 @@ endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
create_target(ll::oslibraries)
add_library( ll::oslibraries INTERFACE IMPORTED )
if (LINUX)
target_link_libraries( ll::oslibraries INTERFACE

2
indra/cmake/NDOF.cmake
View File

@ -4,7 +4,7 @@ include(Prebuilt)
set(NDOF ON CACHE BOOL "Use NDOF space navigator joystick library.")
include_guard()
create_target( ll::ndof )
add_library( ll::ndof INTERFACE IMPORTED )
if (NDOF)
if (WINDOWS OR DARWIN)

2
indra/cmake/NGHTTP2.cmake
View File

@ -2,7 +2,7 @@ include(Linking)
include(Prebuilt)
include_guard()
create_target( ll::nghttp2 )
add_library( ll::nghttp2 INTERFACE IMPORTED )
use_prebuilt_binary(nghttp2)
if (WINDOWS)

2
indra/cmake/NVAPI.cmake
View File

@ -5,7 +5,7 @@ set(NVAPI ON CACHE BOOL "Use NVAPI.")
if (NVAPI)
if (WINDOWS)
create_target( ll::nvapi )
add_library( ll::nvapi INTERFACE IMPORTED )
target_link_libraries( ll::nvapi INTERFACE nvapi)
use_prebuilt_binary(nvapi)
endif (WINDOWS)

2
indra/cmake/OPENAL.cmake
View File

@ -12,7 +12,7 @@ if(OPENAL)
endif()
if (USE_OPENAL)
create_target( ll::openal )
add_library( ll::openal INTERFACE IMPORTED )
target_include_directories( ll::openal SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/AL")
target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
use_prebuilt_binary(openal)

2
indra/cmake/OpenJPEG.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::openjpeg )
add_library( ll::openjpeg INTERFACE IMPORTED )
use_prebuilt_binary(openjpeg)

2
indra/cmake/OpenSSL.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target(ll::openssl)
add_library( ll::openssl INTERFACE IMPORTED )
use_prebuilt_binary(openssl)
if (WINDOWS)

2
indra/cmake/PNG.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target(ll::libpng)
add_library( ll::libpng INTERFACE IMPORTED )
use_prebuilt_binary(libpng)
if (WINDOWS)

2
indra/cmake/PluginAPI.cmake
View File

@ -1,6 +1,6 @@
# -*- cmake -*-
create_target( ll::pluginlibraries)
add_library( ll::pluginlibraries INTERFACE IMPORTED )
if (WINDOWS)
target_link_libraries( ll::pluginlibraries INTERFACE

4
indra/cmake/Prebuilt.cmake
View File

@ -57,7 +57,3 @@ macro (use_prebuilt_binary _binary)
endif (NOT ${_binary}_installed EQUAL 0)
endmacro (use_prebuilt_binary _binary)
function( create_target name )
add_library( ${name} INTERFACE IMPORTED )
endfunction()

4
indra/cmake/UI.cmake
View File

@ -6,7 +6,7 @@ if (LINUX)
use_prebuilt_binary(gtk-atk-pango-glib)
endif (LINUX)
create_target( ll::uilibraries )
add_library( ll::uilibraries INTERFACE IMPORTED )
if (LINUX)
target_link_libraries( ll::uilibraries INTERFACE
@ -68,5 +68,5 @@ target_include_directories( ll::uilibraries SYSTEM INTERFACE
#endforeach(include)
if (LINUX)
set_target_properties(ll::uilibraries PROPERTIES COMPILE_DEFINITIONS LL_GTK=1 LL_X11=1 )
target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
endif (LINUX)

2
indra/cmake/URIPARSER.cmake
View File

@ -1,7 +1,7 @@
# -*- cmake -*-
include_guard()
create_target( ll::uriparser )
add_library( ll::uriparser INTERFACE IMPORTED )
include(Prebuilt)

2
indra/cmake/XmlRpcEpi.cmake
View File

@ -2,7 +2,7 @@
include(Prebuilt)
include_guard()
create_target( ll::xmlrpc-epi )
add_library( ll::xmlrpc-epi INTERFACE IMPORTED )
use_prebuilt_binary(xmlrpc-epi)
target_link_libraries(ll::xmlrpc-epi INTERFACE xmlrpc-epi )

2
indra/cmake/ZLIBNG.cmake
View File

@ -3,7 +3,7 @@
include(Prebuilt)
include_guard()
create_target(ll::zlib-ng)
add_library( ll::zlib-ng INTERFACE IMPORTED )
use_prebuilt_binary(zlib-ng)
if (WINDOWS)

2
indra/cmake/bugsplat.cmake
View File

@ -10,7 +10,7 @@ else (INSTALL_PROPRIETARY)
endif (INSTALL_PROPRIETARY)
include_guard()
create_target(ll::bugsplat)
add_library( ll::bugsplat INTERFACE IMPORTED )
if (USE_BUGSPLAT)
include(Prebuilt)

2
indra/newview/CMakeLists.txt
View File

@ -1537,7 +1537,7 @@ if (WINDOWS)
if (INTEL_MEMOPS_LIBRARY)
create_target( ll::intel_memops )
add_library( ll::intel_memops INTERFACE IMPORTED )
target_link_libraries( ll::intel_memops ${INTEL_MEMOPS_LIBRARY} )
endif (INTEL_MEMOPS_LIBRARY)