Switch over to standard target_link_libraries (cmake requirements are high enough now).

master
Nicky 2022-04-17 17:32:14 +02:00
parent 34b5c5e890
commit 6d0bba9c03
34 changed files with 79 additions and 82 deletions

View File

@ -12,7 +12,7 @@ if (WINDOWS)
else (LLCOMMON_LINK_SHARED)
set(APR_selector "")
endif (LLCOMMON_LINK_SHARED)
set_target_libraries( ll::apr
target_link_libraries( ll::apr INTERFACE
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
@ -26,13 +26,13 @@ elseif (DARWIN)
set(APRUTIL_selector "a")
endif (LLCOMMON_LINK_SHARED)
set_target_libraries( ll::apr
target_link_libraries( ll::apr INTERFACE
libapr-1.${APR_selector}
libaprutil-1.${APRUTIL_selector}
iconv
)
else (WINDOWS)
set_target_libraries( ll::apr
target_link_libraries( ll::apr INTERFACE
apr-1
aprutil-1
iconv

View File

@ -8,8 +8,8 @@ use_prebuilt_binary(ogg_vorbis)
set_target_include_dirs( ll::vorbis ${LIBS_PREBUILT_DIR}/include )
if (WINDOWS)
set_target_libraries(ll::vorbis ogg_static vorbis_static vorbisenc_static vorbisfile_static )
target_link_libraries(ll::vorbis INTERFACE ogg_static vorbis_static vorbisenc_static vorbisfile_static )
else (WINDOWS)
set_target_libraries(ll::vorbis ogg vorbis vorbisenc vorbisfile )
target_link_libraries(ll::vorbis INTERFACE ogg vorbis vorbisenc vorbisfile )
endif (WINDOWS)

View File

@ -11,7 +11,7 @@ use_prebuilt_binary(boost)
set(addrsfx "-x${ADDRESS_SIZE}")
if (WINDOWS)
set_target_libraries( ll::boost
target_link_libraries( ll::boost INTERFACE
libboost_context-mt${addrsfx}
libboost_fiber-mt${addrsfx}
libboost_filesystem-mt${addrsfx}
@ -20,7 +20,7 @@ if (WINDOWS)
libboost_system-mt${addrsfx}
libboost_thread-mt${addrsfx})
elseif (LINUX)
set_target_libraries( ll::boost
target_link_libraries( ll::boost INTERFACE
boost_context-mt${addrsfx}
boost_fiber-mt${addrsfx}
boost_filesystem-mt${addrsfx}
@ -30,7 +30,7 @@ elseif (LINUX)
boost_system-mt${addrsfx}
boost_thread-mt${addrsfx})
elseif (DARWIN)
set_target_libraries( ll::boost
target_link_libraries( ll::boost INTERFACE
boost_context-mt${addrsfx}
boost_fiber-mt${addrsfx}
boost_filesystem-mt${addrsfx}

View File

@ -9,7 +9,7 @@ use_prebuilt_binary(dullahan)
set_target_include_dirs( cef::cef ${LIBS_PREBUILT_DIR}/include/cef)
if (WINDOWS)
set_target_libraries( cef::cef
target_link_libraries( cef::cef INTERFACE
libcef.lib
libcef_dll_wrapper.lib
dullahan.lib
@ -25,7 +25,7 @@ elseif (DARWIN)
message(FATAL_ERROR "CEF not found")
endif()
set_target_libraries( cef::cef
target_link_libraries( cef::cef INTERFACE
${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a
${APPKIT_LIBRARY}

View File

@ -6,8 +6,8 @@ create_target(ll::libcurl)
use_prebuilt_binary(curl)
if (WINDOWS)
set_target_libraries(ll::libcurl libcurl.lib)
target_link_libraries(ll::libcurl INTERFACE libcurl.lib)
else (WINDOWS)
set_target_libraries(ll::libcurl libcurl.a)
target_link_libraries(ll::libcurl INTERFACE libcurl.a)
endif (WINDOWS)
set_target_include_dirs( ll::libcurl ${LIBS_PREBUILT_DIR}/include)

View File

@ -6,10 +6,10 @@ create_target( ll::expat INTERFACE IMPORTED )
use_prebuilt_binary(expat)
if (WINDOWS)
set_target_libraries( ll::expat libexpatMT )
target_link_libraries( ll::expat INTERFACE libexpatMT )
set(EXPAT_COPY libexpatMT.dll)
else (WINDOWS)
set_target_libraries( ll::expat expat )
target_link_libraries( ll::expat INTERFACE expat )
if (DARWIN)
set(EXPAT_COPY libexpat.1.dylib libexpat.dylib)
else ()

View File

@ -23,7 +23,7 @@ if (USE_FMODSTUDIO)
if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
# If the path have been specified in the arguments, use that
set_target_libraries(fmodstudio::fmodstudio ${FMODSTUDIO_LIBRARY})
target_link_libraries(fmodstudio::fmodstudio INTERFACE ${FMODSTUDIO_LIBRARY})
set_target_include_dirs(fmodstudio::fmodstudio ${FMODSTUDIO_INCLUDE_DIR})
else (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
# If not, we're going to try to get the package listed in autobuild.xml
@ -32,12 +32,12 @@ if (USE_FMODSTUDIO)
include(Prebuilt)
use_prebuilt_binary(fmodstudio)
if (WINDOWS)
set_target_libraries( ll::fmodstudio fmod_vc)
target_link_libraries( ll::fmodstudio INTERFACE fmod_vc)
elseif (DARWIN)
#despite files being called libfmod.dylib, we are searching for fmod
set_target_libraries( ll::fmodstudio fmod)
target_link_libraries( ll::fmodstudio INTERFACE fmod)
elseif (LINUX)
set_target_libraries( ll::fmodstudio fmod)
target_link_libraries( ll::fmodstudio INTERFACE fmod)
endif (WINDOWS)
set_target_include_dirs(ll::fmodstudio ${LIBS_PREBUILT_DIR}/include/fmodstudio)

View File

@ -6,5 +6,5 @@ create_target( ll::freetype)
use_prebuilt_binary(freetype)
set_target_include_dirs( ll::freetype ${LIBS_PREBUILT_DIR}/include/freetype2/)
set_target_libraries( ll::freetype freetype )
target_link_libraries( ll::freetype INTERFACE freetype )

View File

@ -7,5 +7,5 @@ create_target( ll::glod )
use_prebuilt_binary(glod)
set_target_include_dirs( ll::glod ${LIBS_PREBUILT_DIR}/include)
set_target_libraries( ll::glod GLOD )
target_link_libraries( ll::glod INTERFACE GLOD )
target_compile_definitions( ll::glod INTERFACE LL_GLOD=1)

View File

@ -13,15 +13,14 @@ set_target_include_dirs( ll::googlemock
if (LINUX)
# VWR-24366: gmock is underlinked, it needs gtest.
set_target_libraries( ll::googlemock gmock gtest)
target_link_libraries( ll::googlemock INTERFACE gmock gtest)
elseif(WINDOWS)
set_target_libraries( ll::googlemock gmock)
target_link_libraries( ll::googlemock INTERFACE gmock)
set_target_include_dirs( ll::googlemock
${LIBS_PREBUILT_DIR}/include
${LIBS_PREBUILT_DIR}/include/gmock)
elseif(DARWIN)
set_target_libraries( ll::googlemock gmock gtest)
target_link_libraries( ll::googlemock INTERFACE gmock gtest)
endif(LINUX)

View File

@ -6,11 +6,11 @@ create_target( ll::hunspell )
use_prebuilt_binary(libhunspell)
if (WINDOWS)
set_target_libraries( ll::hunspell libhunspell)
target_link_libraries( ll::hunspell INTERFACE libhunspell)
elseif(DARWIN)
set_target_libraries( ll::hunspell hunspell-1.3)
target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
elseif(LINUX)
set_target_libraries( ll::hunspell hunspell-1.3)
target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
endif()
set_target_include_dirs( ll::hunspell ${LIBS_PREBUILT_DIR}/include/hunspell)
use_prebuilt_binary(dictionaries)

View File

@ -8,10 +8,10 @@ create_target(ll::jpeglib)
use_prebuilt_binary(jpeglib)
if (LINUX)
set_target_libraries( ll::jpeglib jpeg)
target_link_libraries( ll::jpeglib INTERFACE jpeg)
elseif (DARWIN)
set_target_libraries( ll::jpeglib jpeg)
target_link_libraries( ll::jpeglib INTERFACE jpeg)
elseif (WINDOWS)
set_target_libraries( ll::jpeglib jpeglib)
target_link_libraries( ll::jpeglib INTERFACE jpeglib)
endif (LINUX)
set_target_include_dirs( ll::jpeglib ${LIBS_PREBUILT_DIR}/include)

View File

@ -6,10 +6,10 @@ create_target( ll::jsoncpp)
use_prebuilt_binary(jsoncpp)
if (WINDOWS)
set_target_libraries( ll::jsoncpp json_libmd.lib )
target_link_libraries( ll::jsoncpp INTERFACE json_libmd.lib )
elseif (DARWIN)
set_target_libraries( ll::jsoncpp libjson_darwin_libmt.a )
target_link_libraries( ll::jsoncpp INTERFACE libjson_darwin_libmt.a )
elseif (LINUX)
set_target_libraries( ll::jsoncpp libjson_linux-gcc-4.1.3_libmt.a )
target_link_libraries( ll::jsoncpp INTERFACE libjson_linux-gcc-4.1.3_libmt.a )
endif (WINDOWS)
set_target_include_dirs( ll::jsoncpp ${LIBS_PREBUILT_DIR}/include/json)

View File

@ -14,9 +14,9 @@ if (USE_KDU)
include(Prebuilt)
use_prebuilt_binary(kdu)
if (WINDOWS)
set_target_libraries( ll::kdu kdu.lib)
target_link_libraries( ll::kdu INTERFACE kdu.lib)
else (WINDOWS)
set_target_libraries( ll::kdu libkdu.a)
target_link_libraries( ll::kdu INTERFACE libkdu.a)
endif (WINDOWS)
set_target_include_dirs( ll::kdu

View File

@ -22,14 +22,14 @@ if (HAVOK)
include(Havok)
use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
set_target_libraries( llphysicsextensions llphysicsextensions)
target_link_libraries( llphysicsextensions INTERFACE llphysicsextensions)
elseif (HAVOK_TPV)
use_prebuilt_binary(llphysicsextensions_tpv)
set_target_libraries( llphysicsextensions llphysicsextensions_tpv)
target_link_libraries( llphysicsextensions INTERFACE llphysicsextensions_tpv)
else (HAVOK)
use_prebuilt_binary(llphysicsextensions_stub)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
set_target_libraries( llphysicsextensions llphysicsextensionsstub)
target_link_libraries( llphysicsextensions INTERFACE llphysicsextensionsstub)
endif (HAVOK)
set_target_include_dirs(llphysicsextensions ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)

View File

@ -12,20 +12,20 @@ use_prebuilt_binary(pcre)
use_prebuilt_binary(libxml2)
create_target( ll::pcre )
set_target_libraries( ll::pcre pcrecpp pcre )
target_link_libraries( ll::pcre INTERFACE pcrecpp pcre )
create_target( ll::minizip-ng )
if (WINDOWS)
set_target_libraries( ll::minizip-ng libminizip )
target_link_libraries( ll::minizip-ng INTERFACE libminizip )
else()
set_target_libraries( ll::minizip-ng minizip )
target_link_libraries( ll::minizip-ng INTERFACE minizip )
endif()
create_target( ll::libxml )
if (WINDOWS)
set_target_libraries( ll::libxml libxml2_a)
target_link_libraries( ll::libxml INTERFACE libxml2_a)
else()
set_target_libraries( ll::libxml xml2)
target_link_libraries( ll::libxml INTERFACE xml2)
endif()
create_target( ll::colladadom )
@ -34,9 +34,9 @@ set_target_include_dirs( ll::colladadom
${LIBS_PREBUILT_DIR}/include/collada/1.4
)
if (WINDOWS)
set_target_libraries(ll::colladadom libcollada14dom23-s ll::libxml ll::minizip-ng )
target_link_libraries(ll::colladadom INTERFACE libcollada14dom23-s ll::libxml ll::minizip-ng )
elseif (DARWIN)
set_target_libraries(ll::colladadom collada14dom ll::libxml ll::minizip-ng)
target_link_libraries(ll::colladadom INTERFACE collada14dom ll::libxml ll::minizip-ng)
elseif (LINUX)
set_target_libraries(ll::colladadom collada14dom ll::libxml ll::minizip-ng)
target_link_libraries(ll::colladadom INTERFACE collada14dom ll::libxml ll::minizip-ng)
endif()

View File

@ -10,7 +10,7 @@ create_target(ll::sdl)
if (LINUX)
use_prebuilt_binary(SDL)
set_target_include_dirs( ll::sdl ${LIBS_PREBUILT_DIR}/i686-linux)
set_target_libraries( ll::sdl SDL directfb fusion direct X11)
target_link_libraries( ll::sdl INTERFACE SDL directfb fusion direct X11)
target_compile_definitions( ll::sdl INTERFACE LL_SDL=1)
endif (LINUX)

View File

@ -10,18 +10,18 @@ set(LIBVLCPLUGIN ON CACHE BOOL
"LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
if (WINDOWS)
set_target_libraries( ll::libvlc
target_link_libraries( ll::libvlc INTERFACE
libvlc.lib
libvlccore.lib
)
elseif (DARWIN)
set_target_libraries( ll::libvlc
target_link_libraries( ll::libvlc INTERFACE
libvlc.dylib
libvlccore.dylib
)
elseif (LINUX)
# Specify a full path to make sure we get a static link
set_target_libraries( ll::libvlc
target_link_libraries( ll::libvlc INTERFACE
${LIBS_PREBUILT_DIR}/lib/libvlc.a
${LIBS_PREBUILT_DIR}/lib/libvlccore.a
)

View File

@ -58,12 +58,12 @@ link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
create_target(ll::oslibraries)
if (LINUX)
set_target_libraries( ll::oslibraries
target_link_libraries( ll::oslibraries INTERFACE
dl
pthread
rt)
elseif (WINDOWS)
set_target_libraries( ll::oslibraries
target_link_libraries( ll::oslibraries INTERFACE
advapi32
shell32
ws2_32
@ -89,7 +89,7 @@ else()
find_library(APPKIT_LIBRARY AppKit)
find_library(COREAUDIO_LIBRARY CoreAudio)
set_target_libraries( ll::oslibraries
target_link_libraries( ll::oslibraries INTERFACE
${COCOA_LIBRARY}
${IOKIT_LIBRARY}
${COREFOUNDATION_LIBRARY}

View File

@ -14,9 +14,9 @@ if (NDOF)
endif (WINDOWS OR DARWIN)
if (WINDOWS)
set_target_libraries( ll::ndof libndofdev)
target_link_libraries( ll::ndof INTERFACE libndofdev)
elseif (DARWIN OR LINUX)
set_target_libraries( ll::ndof ndofdev)
target_link_libraries( ll::ndof INTERFACE ndofdev)
endif (WINDOWS)
target_compile_definitions( ll::ndof INTERFACE LIB_NDOF=1)
endif (NDOF)

View File

@ -6,10 +6,10 @@ create_target( ll::nghttp2 )
use_prebuilt_binary(nghttp2)
if (WINDOWS)
set_target_libraries( ll::nghttp2 ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib)
target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib)
elseif (DARWIN)
set_target_libraries( ll::nghttp2 libnghttp2.dylib)
target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.dylib)
else (WINDOWS)
set_target_libraries( ll::nghttp2 libnghttp2.a )
target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.a )
endif (WINDOWS)
set_target_include_dirs( ll::nghttp2 ${LIBS_PREBUILT_DIR}/include/nghttp2)

View File

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

View File

@ -18,12 +18,12 @@ if (USE_OPENAL)
use_prebuilt_binary(openal)
if(WINDOWS)
set_target_libraries( ll::openal
target_link_libraries( ll::openal INTERFACE
OpenAL32
alut
)
elseif(LINUX)
set_target_libraries( ll::openal
target_link_libraries( ll::openal INTERFACE
openal
alut
)

View File

@ -6,5 +6,5 @@ create_target( ll::openjpeg )
use_prebuilt_binary(openjpeg)
set_target_libraries(ll::openjpeg openjpeg )
target_link_libraries(ll::openjpeg INTERFACE openjpeg )
set_target_include_dirs( ll::openjpeg ${LIBS_PREBUILT_DIR}/include/openjpeg)

View File

@ -6,11 +6,11 @@ create_target(ll::openssl)
use_prebuilt_binary(openssl)
if (WINDOWS)
set_target_libraries(ll::openssl libssl libcrypto)
target_link_libraries(ll::openssl INTERFACE libssl libcrypto)
elseif (LINUX)
set_target_libraries(ll::openssl ssl crypto dl)
target_link_libraries(ll::openssl INTERFACE ssl crypto dl)
else()
set_target_libraries(ll::openssl ssl crypto)
target_link_libraries(ll::openssl INTERFACE ssl crypto)
endif (WINDOWS)
set_target_include_dirs(ll::openssl ${LIBS_PREBUILT_DIR}/include)

View File

@ -6,8 +6,8 @@ create_target(ll::libpng)
use_prebuilt_binary(libpng)
if (WINDOWS)
set_target_libraries(ll::libpng libpng16)
target_link_libraries(ll::libpng INTERFACE libpng16)
else()
set_target_libraries(ll::libpng png16 )
target_link_libraries(ll::libpng INTERFACE png16 )
endif()
set_target_include_dirs( ll::libpng ${LIBS_PREBUILT_DIR}/include/libpng16)

View File

@ -3,7 +3,7 @@
create_target( ll::pluginlibraries)
if (WINDOWS)
set_target_libraries( ll::pluginlibraries
target_link_libraries( ll::pluginlibraries INTERFACE
wsock32
ws2_32
psapi

View File

@ -60,9 +60,7 @@ endmacro (use_prebuilt_binary _binary)
function( create_target name )
add_library( ${name} INTERFACE IMPORTED )
endfunction()
function( set_target_libraries target )
set_property( TARGET ${target} PROPERTY INTERFACE_LINK_LIBRARIES ${ARGN} )
endfunction()
function( set_target_include_dirs target)
set_property( TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ARGN} )
endfunction()

View File

@ -9,7 +9,7 @@ endif (LINUX)
create_target( ll::uilibraries )
if (LINUX)
set_target_libraries( ll::uilibraries
target_link_libraries( ll::uilibraries INTERFACE
atk-1.0
gdk-x11-2.0
gdk_pixbuf-2.0
@ -28,7 +28,7 @@ if (LINUX)
)
endif (LINUX)
if( WINDOWS )
set_target_libraries( ll::uilibraries
target_link_libraries( ll::uilibraries INTERFACE
opengl32
comdlg32
dxguid

View File

@ -7,10 +7,10 @@ include(Prebuilt)
use_prebuilt_binary(uriparser)
if (WINDOWS)
set_target_libraries( ll::uriparser uriparser)
target_link_libraries( ll::uriparser INTERFACE uriparser)
elseif (LINUX)
set_target_libraries( ll::uriparser uriparser)
target_link_libraries( ll::uriparser INTERFACE uriparser)
elseif (DARWIN)
set_target_libraries( ll::uriparser liburiparser.dylib)
target_link_libraries( ll::uriparser INTERFACE liburiparser.dylib)
endif (WINDOWS)
set_target_include_dirs( ll::uriparser ${LIBS_PREBUILT_DIR}/include/uriparser)

View File

@ -5,5 +5,5 @@ include_guard()
create_target( ll::xmlrpc-epi )
use_prebuilt_binary(xmlrpc-epi)
set_target_libraries(ll::xmlrpc-epi xmlrpc-epi )
target_link_libraries(ll::xmlrpc-epi INTERFACE xmlrpc-epi )
set_target_include_dirs( ll::xmlrpc-epi ${LIBS_PREBUILT_DIR}/include)

View File

@ -7,8 +7,8 @@ create_target(ll::zlib-ng)
use_prebuilt_binary(zlib-ng)
if (WINDOWS)
set_target_libraries( ll::zlib-ng zlib )
target_link_libraries( ll::zlib-ng INTERFACE zlib )
else()
set_target_libraries( ll::zlib-ng z )
target_link_libraries( ll::zlib-ng INTERFACE z )
endif (WINDOWS)
set_target_include_dirs( ll::zlib-ng ${LIBS_PREBUILT_DIR}/include/zlib-ng)

View File

@ -16,13 +16,13 @@ if (USE_BUGSPLAT)
include(Prebuilt)
use_prebuilt_binary(bugsplat)
if (WINDOWS)
set_target_libraries( ll::bugsplat
target_link_libraries( ll::bugsplat INTERFACE
${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib
)
elseif (DARWIN)
find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
set_target_libraries( ll::bugsplat
target_link_libraries( ll::bugsplat INTERFACE
${BUGSPLAT_LIBRARIES}
)
else (WINDOWS)

View File

@ -1538,7 +1538,7 @@ if (WINDOWS)
if (INTEL_MEMOPS_LIBRARY)
create_target( ll::intel_memops )
set_target_libraries( ll::intel_memops ${INTEL_MEMOPS_LIBRARY} )
target_link_libraries( ll::intel_memops ${INTEL_MEMOPS_LIBRARY} )
endif (INTEL_MEMOPS_LIBRARY)
if (ADDRESS_SIZE EQUAL 64)