diff options
34 files changed, 37 insertions, 41 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index a9500d2068..1c635d4531 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -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) diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index 59a589cd0e..ddba066727 100644 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -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 ) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index e713d50fc1..f4f824769e 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target( ll::boost ) +add_library( ll::boost INTERFACE IMPORTED ) use_prebuilt_binary(boost) diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake index 2b5db1773b..9b77becf29 100644 --- a/indra/cmake/CEFPlugin.cmake +++ b/indra/cmake/CEFPlugin.cmake @@ -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) diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index ce7711e479..e8b04177c1 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target(ll::libcurl) +add_library( ll::libcurl INTERFACE IMPORTED ) use_prebuilt_binary(curl) if (WINDOWS) diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index 4947c40e02..8a48908401 100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake @@ -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) diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake index a3fd9c718a..c5b21ac4e5 100644 --- a/indra/cmake/FMODSTUDIO.cmake +++ b/indra/cmake/FMODSTUDIO.cmake @@ -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) diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index c8454eb3b9..1974e2879e 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -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/) diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake index 9070be302a..db00a309f0 100644 --- a/indra/cmake/GLOD.cmake +++ b/indra/cmake/GLOD.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target( ll::glod ) +add_library( ll::glod INTERFACE IMPORTED ) use_prebuilt_binary(glod) diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake index 01ef4de093..2036e43dd0 100644 --- a/indra/cmake/GoogleMock.cmake +++ b/indra/cmake/GoogleMock.cmake @@ -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 ) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index 0994d2b5f4..7786418226 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target( ll::hunspell ) +add_library( ll::hunspell INTERFACE IMPORTED ) use_prebuilt_binary(libhunspell) if (WINDOWS) diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index af984b6ac3..a6ef5d4ad9 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -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) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 1c354350c3..0b6a82e576 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target( ll::jsoncpp) +add_library( ll::jsoncpp INTERFACE IMPORTED ) use_prebuilt_binary(jsoncpp) if (WINDOWS) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index bf358cc0eb..fda25610da 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -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) diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 014ec6a98b..9c628b84b1 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -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; diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 0026f183e6..e643243fca 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -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 diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index fdeb4aa434..8cf450ff21 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -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) diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake index b614b7304f..599ce02844 100644 --- a/indra/cmake/LibVLCPlugin.cmake +++ b/indra/cmake/LibVLCPlugin.cmake @@ -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 diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 7b89e8707f..5a16776e57 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -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 diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index 6daf0e0741..b88fbccf2a 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -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) diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake index 7e59a7d9a7..2ac204bfcb 100644 --- a/indra/cmake/NGHTTP2.cmake +++ b/indra/cmake/NGHTTP2.cmake @@ -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) diff --git a/indra/cmake/NVAPI.cmake b/indra/cmake/NVAPI.cmake index b06cc78087..ff5a5428e0 100644 --- a/indra/cmake/NVAPI.cmake +++ b/indra/cmake/NVAPI.cmake @@ -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) diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index faa247769b..84dad367b7 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -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) diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 07dee5c23d..184fbb3c5f 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target( ll::openjpeg ) +add_library( ll::openjpeg INTERFACE IMPORTED ) use_prebuilt_binary(openjpeg) diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 6c9abc9e7f..dfc6520362 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target(ll::openssl) +add_library( ll::openssl INTERFACE IMPORTED ) use_prebuilt_binary(openssl) if (WINDOWS) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 5a8d3e197d..672f963ea1 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include_guard() -create_target(ll::libpng) +add_library( ll::libpng INTERFACE IMPORTED ) use_prebuilt_binary(libpng) if (WINDOWS) diff --git a/indra/cmake/PluginAPI.cmake b/indra/cmake/PluginAPI.cmake index 076598f6cc..114415e514 100644 --- a/indra/cmake/PluginAPI.cmake +++ b/indra/cmake/PluginAPI.cmake @@ -1,6 +1,6 @@ # -*- cmake -*- -create_target( ll::pluginlibraries) +add_library( ll::pluginlibraries INTERFACE IMPORTED ) if (WINDOWS) target_link_libraries( ll::pluginlibraries INTERFACE diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 593eb3958c..f0192ec45b 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -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() - diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index c23fb6e8a7..6a2e6f22df 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -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) diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake index 8639eab891..cc181f74f8 100644 --- a/indra/cmake/URIPARSER.cmake +++ b/indra/cmake/URIPARSER.cmake @@ -1,7 +1,7 @@ # -*- cmake -*- include_guard() -create_target( ll::uriparser ) +add_library( ll::uriparser INTERFACE IMPORTED ) include(Prebuilt) diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index aad9d1e476..83f06788f2 100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -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 ) diff --git a/indra/cmake/ZLIBNG.cmake b/indra/cmake/ZLIBNG.cmake index a7779af3cd..221452d9d0 100644 --- a/indra/cmake/ZLIBNG.cmake +++ b/indra/cmake/ZLIBNG.cmake @@ -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) diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index 21a6e074fc..f645d9d449 100644 --- a/indra/cmake/bugsplat.cmake +++ b/indra/cmake/bugsplat.cmake @@ -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) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 943e621eb8..23714442d5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -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) |