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

Move CMake files to modernized cmake syntax, step 1. 

Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
master
Nicky 2022-04-06 16:32:52 +02:00
parent 7522cea252
commit 786b291d9c
79 changed files with 630 additions and 1492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/cmake/00-Common.cmake
View File

@ -70,12 +70,6 @@ if (WINDOWS)
if( ADDRESS_SIZE EQUAL 32 ) if( ADDRESS_SIZE EQUAL 32 )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")
endif() endif()
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo"
CACHE STRING "C++ compiler release-with-debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /Zo"
CACHE STRING "C++ compiler release options" FORCE)
# zlib has assembly-language object files incompatible with SAFESEH # zlib has assembly-language object files incompatible with SAFESEH
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099")
@ -87,15 +81,16 @@ if (WINDOWS)
# /DDOM_DYNAMIC # For shared library colladadom # /DDOM_DYNAMIC # For shared library colladadom
) )
add_compile_options( add_compile_options(
/GS
/TP /Zo
/W3 /GS
/c /TP
/Zc:forScope /W3
/nologo /c
/Oy- /Zc:forScope
# /arch:SSE2 /nologo
/fp:fast /Oy-
/fp:fast
) )
# Nicky: x64 implies SSE2 # Nicky: x64 implies SSE2

53
indra/cmake/APR.cmake
View File

@ -1,11 +1,11 @@
include(Linking) include(Linking)
include(Prebuilt) include(Prebuilt)
set(APR_FIND_QUIETLY ON) if( TARGET apr::apr )
set(APR_FIND_REQUIRED ON) return()
endif()
set(APRUTIL_FIND_QUIETLY ON) create_target( apr::apr)
set(APRUTIL_FIND_REQUIRED ON)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindAPR) include(FindAPR)
@ -17,18 +17,11 @@ else (USESYSTEMLIBS)
else (LLCOMMON_LINK_SHARED) else (LLCOMMON_LINK_SHARED)
set(APR_selector "") set(APR_selector "")
endif (LLCOMMON_LINK_SHARED) endif (LLCOMMON_LINK_SHARED)
set(APR_LIBRARIES set_target_libraries( apr::apr
debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apr-1.lib ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
optimized ${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
set(APRICONV_LIBRARIES )
debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apriconv-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
)
set(APRUTIL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
)
elseif (DARWIN) elseif (DARWIN)
if (LLCOMMON_LINK_SHARED) if (LLCOMMON_LINK_SHARED)
set(APR_selector "0.dylib") set(APR_selector "0.dylib")
@ -37,18 +30,20 @@ else (USESYSTEMLIBS)
set(APR_selector "a") set(APR_selector "a")
set(APRUTIL_selector "a") set(APRUTIL_selector "a")
endif (LLCOMMON_LINK_SHARED) endif (LLCOMMON_LINK_SHARED)
set(APR_LIBRARIES libapr-1.${APR_selector})
set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
set(APRICONV_LIBRARIES iconv)
else (WINDOWS)
set(APR_LIBRARIES apr-1)
set(APRUTIL_LIBRARIES aprutil-1)
set(APRICONV_LIBRARIES iconv)
endif (WINDOWS)
set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
if (LINUX) set_target_libraries( apr::apr
list(APPEND APRUTIL_LIBRARIES uuid) libapr-1.${APR_selector}
list(APPEND APRUTIL_LIBRARIES rt) libaprutil-1.${APRUTIL_selector}
endif (LINUX) iconv
)
else (WINDOWS)
set_target_libraries( apr::apr
apr-1
aprutil-1
iconv
uuid
rt
)
endif (WINDOWS)
set_target_include_dirs( apr::apr ${LIBS_PREBUILT_DIR}/include/apr-1 )
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

5
indra/cmake/Atmosphere.cmake
View File

@ -1,5 +0,0 @@
# -*- cmake -*-
include(Prebuilt)
use_prebuilt_binary(libatmosphere)
set(LIBATMOSPHERE_LIBRARIES atmosphere)
set(LIBATMOSPHERE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/atmosphere)

33
indra/cmake/Audio.cmake
View File

@ -1,6 +1,11 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if(TARGET vorbis::vorbis)
return()
endif()
create_target(vorbis::vorbis)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindPkgConfig) include(FindPkgConfig)
pkg_check_modules(OGG REQUIRED ogg) pkg_check_modules(OGG REQUIRED ogg)
@ -9,34 +14,12 @@ if (USESYSTEMLIBS)
pkg_check_modules(VORBISFILE REQUIRED vorbisfile) pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(ogg_vorbis) use_prebuilt_binary(ogg_vorbis)
set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set_target_include_dirs( vorbis::vorbis ${LIBS_PREBUILT_DIR}/include )
set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
if (WINDOWS) if (WINDOWS)
set(OGG_LIBRARIES set_target_libraries(vorbis::vorbis ogg_static vorbis_static vorbisenc_static vorbisfile_static )
optimized ogg_static
debug ogg_static_d)
set(VORBIS_LIBRARIES
optimized vorbis_static
debug vorbis_static_d)
set(VORBISENC_LIBRARIES
optimized vorbisenc_static
debug vorbisenc_static_d)
set(VORBISFILE_LIBRARIES
optimized vorbisfile_static
debug vorbisfile_static_d)
else (WINDOWS) else (WINDOWS)
set(OGG_LIBRARIES ogg) set_target_libraries(vorbis::vorbis ogg vorbis vorbisenc vorbisfile )
set(VORBIS_LIBRARIES vorbis)
set(VORBISENC_LIBRARIES vorbisenc)
set(VORBISFILE_LIBRARIES vorbisfile)
endif (WINDOWS) endif (WINDOWS)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
link_directories(
${VORBIS_LIBRARY_DIRS}
${VORBISENC_LIBRARY_DIRS}
${VORBISFILE_LIBRARY_DIRS}
${OGG_LIBRARY_DIRS}
)

103
indra/cmake/Boost.cmake
View File

@ -1,6 +1,11 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if( TARGET boost::boost )
return()
endif()
create_target( boost::boost )
set(Boost_FIND_QUIETLY ON) set(Boost_FIND_QUIETLY ON)
set(Boost_FIND_REQUIRED ON) set(Boost_FIND_REQUIRED ON)
@ -24,80 +29,34 @@ else (USESYSTEMLIBS)
set(addrsfx "-x${ADDRESS_SIZE}") set(addrsfx "-x${ADDRESS_SIZE}")
if (WINDOWS) if (WINDOWS)
set(BOOST_CONTEXT_LIBRARY set_target_libraries( boost::boost
optimized libboost_context-mt${addrsfx} libboost_context-mt${addrsfx}
debug libboost_context-mt${addrsfx}-gd) libboost_fiber-mt${addrsfx}
set(BOOST_FIBER_LIBRARY libboost_filesystem-mt${addrsfx}
optimized libboost_fiber-mt${addrsfx} libboost_program_options-mt${addrsfx}
debug libboost_fiber-mt${addrsfx}-gd) libboost_regex-mt${addrsfx}
set(BOOST_FILESYSTEM_LIBRARY libboost_system-mt${addrsfx}
optimized libboost_filesystem-mt${addrsfx} libboost_thread-mt${addrsfx})
debug libboost_filesystem-mt${addrsfx}-gd)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-mt${addrsfx}
debug libboost_program_options-mt${addrsfx}-gd)
set(BOOST_REGEX_LIBRARY
optimized libboost_regex-mt${addrsfx}
debug libboost_regex-mt${addrsfx}-gd)
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-mt${addrsfx}
debug libboost_signals-mt${addrsfx}-gd)
set(BOOST_SYSTEM_LIBRARY
optimized libboost_system-mt${addrsfx}
debug libboost_system-mt${addrsfx}-gd)
set(BOOST_THREAD_LIBRARY
optimized libboost_thread-mt${addrsfx}
debug libboost_thread-mt${addrsfx}-gd)
elseif (LINUX) elseif (LINUX)
set(BOOST_CONTEXT_LIBRARY set_target_libraries( boost::boost
optimized boost_context-mt${addrsfx} boost_context-mt${addrsfx}
debug boost_context-mt${addrsfx}-d) boost_fiber-mt${addrsfx}
set(BOOST_FIBER_LIBRARY boost_filesystem-mt${addrsfx}
optimized boost_fiber-mt${addrsfx} boost_program_options-mt${addrsfx}
debug boost_fiber-mt${addrsfx}-d) boost_regex-mt${addrsfx}
set(BOOST_FILESYSTEM_LIBRARY boost_signals-mt${addrsfx}
optimized boost_filesystem-mt${addrsfx} boost_system-mt${addrsfx}
debug boost_filesystem-mt${addrsfx}-d) boost_thread-mt${addrsfx})
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt${addrsfx}
debug boost_program_options-mt${addrsfx}-d)
set(BOOST_REGEX_LIBRARY
optimized boost_regex-mt${addrsfx}
debug boost_regex-mt${addrsfx}-d)
set(BOOST_SIGNALS_LIBRARY
optimized boost_signals-mt${addrsfx}
debug boost_signals-mt${addrsfx}-d)
set(BOOST_SYSTEM_LIBRARY
optimized boost_system-mt${addrsfx}
debug boost_system-mt${addrsfx}-d)
set(BOOST_THREAD_LIBRARY
optimized boost_thread-mt${addrsfx}
debug boost_thread-mt${addrsfx}-d)
elseif (DARWIN) elseif (DARWIN)
set(BOOST_CONTEXT_LIBRARY set_target_libraries( boost::boost
optimized boost_context-mt${addrsfx} boost_context-mt${addrsfx}
debug boost_context-mt${addrsfx}-d) boost_fiber-mt${addrsfx}
set(BOOST_FIBER_LIBRARY boost_filesystem-mt${addrsfx}
optimized boost_fiber-mt${addrsfx} boost_program_options-mt${addrsfx}
debug boost_fiber-mt${addrsfx}-d) boost_regex-mt${addrsfx}
set(BOOST_FILESYSTEM_LIBRARY boost_signals-mt${addrsfx}
optimized boost_filesystem-mt${addrsfx} boost_system-mt${addrsfx}
debug boost_filesystem-mt${addrsfx}-d) boost_thread-mt${addrsfx})
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt${addrsfx}
debug boost_program_options-mt${addrsfx}-d)
set(BOOST_REGEX_LIBRARY
optimized boost_regex-mt${addrsfx}
debug boost_regex-mt${addrsfx}-d)
set(BOOST_SIGNALS_LIBRARY
optimized boost_signals-mt${addrsfx}
debug boost_signals-mt${addrsfx}-d)
set(BOOST_SYSTEM_LIBRARY
optimized boost_system-mt${addrsfx}
debug boost_system-mt${addrsfx}-d)
set(BOOST_THREAD_LIBRARY
optimized boost_thread-mt${addrsfx}
debug boost_thread-mt${addrsfx}-d)
endif (WINDOWS) endif (WINDOWS)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

13
indra/cmake/CEFPlugin.cmake
View File

@ -2,18 +2,21 @@
include(Linking) include(Linking)
include(Prebuilt) include(Prebuilt)
if(TARGET cef::cef)
return()
endif()
create_target( cef::cef )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
set(CEFPLUGIN OFF CACHE BOOL set(CEFPLUGIN OFF CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.") "CEFPLUGIN support for the llplugin/llmedia test apps.")
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(dullahan) use_prebuilt_binary(dullahan)
set(CEFPLUGIN ON CACHE BOOL set_target_include_dirs( cef::cef ${LIBS_PREBUILT_DIR}/include/cef)
"CEFPLUGIN support for the llplugin/llmedia test apps.")
set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
set(CEF_PLUGIN_LIBRARIES set_target_libraries( cef::cef
libcef.lib libcef.lib
libcef_dll_wrapper.lib libcef_dll_wrapper.lib
dullahan.lib dullahan.lib
@ -29,7 +32,7 @@ elseif (DARWIN)
message(FATAL_ERROR "CEF not found") message(FATAL_ERROR "CEF not found")
endif() endif()
set(CEF_PLUGIN_LIBRARIES set_target_libraries( cef::cef
${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a ${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a
${APPKIT_LIBRARY} ${APPKIT_LIBRARY}

17
indra/cmake/CMakeLists.txt
View File

@ -39,37 +39,22 @@ set(cmake_SOURCE_FILES
GLEXT.cmake GLEXT.cmake
GLH.cmake GLH.cmake
GLOD.cmake GLOD.cmake
## GStreamer010Plugin.cmake
GoogleMock.cmake GoogleMock.cmake
Havok.cmake Havok.cmake
Hunspell.cmake Hunspell.cmake
JPEG.cmake JsonCpp.cmake
JsonCpp.cmake
LLAddBuildTest.cmake LLAddBuildTest.cmake
LLAppearance.cmake LLAppearance.cmake
LLAudio.cmake LLAudio.cmake
LLCharacter.cmake
LLCommon.cmake LLCommon.cmake
LLCrashLogger.cmake
LLImage.cmake LLImage.cmake
LLImageJ2COJ.cmake
LLInventory.cmake
LLKDU.cmake LLKDU.cmake
LLLogin.cmake
LLMath.cmake
LLMessage.cmake
LLPhysicsExtensions.cmake LLPhysicsExtensions.cmake
LLPlugin.cmake
LLPrimitive.cmake LLPrimitive.cmake
LLRender.cmake
LLSharedLibs.cmake LLSharedLibs.cmake
LLTestCommand.cmake LLTestCommand.cmake
LLUI.cmake
LLFileSystem.cmake
LLWindow.cmake LLWindow.cmake
LLXML.cmake
Linking.cmake Linking.cmake
MediaPluginBase.cmake
NDOF.cmake NDOF.cmake
OPENAL.cmake OPENAL.cmake
OpenGL.cmake OpenGL.cmake

14
indra/cmake/CURL.cmake
View File

@ -1,19 +1,19 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(CURL_FIND_QUIETLY ON) if( TARGET libcurl::libcurl )
set(CURL_FIND_REQUIRED ON) return()
endif()
create_target(libcurl::libcurl)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindCURL) include(FindCURL)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(curl) use_prebuilt_binary(curl)
if (WINDOWS) if (WINDOWS)
set(CURL_LIBRARIES set_target_libraries(libcurl::libcurl libcurl.lib)
debug libcurld.lib
optimized libcurl.lib)
else (WINDOWS) else (WINDOWS)
set(CURL_LIBRARIES libcurl.a) set_target_libraries(libcurl::libcurl libcurl.a)
endif (WINDOWS) endif (WINDOWS)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set_target_include_dirs( libcurl::libcurl ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

12
indra/cmake/EXPAT.cmake
View File

@ -1,23 +1,25 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(EXPAT_FIND_QUIETLY ON) if( TARGET expat::expat )
set(EXPAT_FIND_REQUIRED ON) return()
endif()
create_target( expat::expat INTERFACE IMPORTED )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindEXPAT) include(FindEXPAT)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(expat) use_prebuilt_binary(expat)
if (WINDOWS) if (WINDOWS)
set(EXPAT_LIBRARIES libexpatMT) set_target_libraries( expat::expat libexpatMT )
set(EXPAT_COPY libexpatMT.dll) set(EXPAT_COPY libexpatMT.dll)
else (WINDOWS) else (WINDOWS)
set(EXPAT_LIBRARIES expat) set_target_libraries( expat::expat expat )
if (DARWIN) if (DARWIN)
set(EXPAT_COPY libexpat.1.dylib libexpat.dylib) set(EXPAT_COPY libexpat.1.dylib libexpat.dylib)
else () else ()
set(EXPAT_COPY libexpat.so.1 libexpat.so) set(EXPAT_COPY libexpat.so.1 libexpat.so)
endif () endif ()
endif (WINDOWS) endif (WINDOWS)
set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set_target_include_dirs( expat::expat ${LIBS_PREBUILT_DIR}/include )
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

26
indra/cmake/FMODSTUDIO.cmake
View File

@ -8,9 +8,17 @@ if (INSTALL_PROPRIETARY)
endif (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY)
if (FMODSTUDIO) if (FMODSTUDIO)
if( TARGET fmodstudio::fmodstudio )
return()
endif()
create_target( fmodstudio::fmodstudio )
set_target_include_dirs( openal::openal "${LIBS_PREBUILT_DIR}/include/AL")
if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR) if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
# If the path have been specified in the arguments, use that # If the path have been specified in the arguments, use that
set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
set_target_libraries(fmodstudio::fmodstudio ${FMODSTUDIO_LIBRARY})
set_target_include_dirs(fmodstudio::fmodstudio ${FMODSTUDIO_INCLUDE_DIR})
else (FMODSTUDIO_LIBRARY AND 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 # If not, we're going to try to get the package listed in autobuild.xml
# Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL)
@ -18,21 +26,15 @@ if (FMODSTUDIO)
include(Prebuilt) include(Prebuilt)
use_prebuilt_binary(fmodstudio) use_prebuilt_binary(fmodstudio)
if (WINDOWS) if (WINDOWS)
set(FMODSTUDIO_LIBRARY set_target_libraries( fmodstudio::fmodstudio fmod_vc)
debug fmodL_vc
optimized fmod_vc)
elseif (DARWIN) elseif (DARWIN)
#despite files being called libfmod.dylib, we are searching for fmod #despite files being called libfmod.dylib, we are searching for fmod
set(FMODSTUDIO_LIBRARY set_target_libraries( fmodstudio::fmodstudio fmod)
debug fmodL
optimized fmod)
elseif (LINUX) elseif (LINUX)
set(FMODSTUDIO_LIBRARY set_target_libraries( fmodstudio::fmodstudio fmod)
debug fmodL
optimized fmod)
endif (WINDOWS) endif (WINDOWS)
set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio) set_target_include_dirs(fmodstudio::fmodstudio ${LIBS_PREBUILT_DIR}/include/fmodstudio)
endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR) endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
endif (FMODSTUDIO) endif (FMODSTUDIO)

10
indra/cmake/FreeType.cmake
View File

@ -1,14 +1,18 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if( TARGET freetype::freetype )
return()
endif()
create_target( freetype::freetype)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindPkgConfig) include(FindPkgConfig)
pkg_check_modules(FREETYPE REQUIRED freetype2) pkg_check_modules(FREETYPE REQUIRED freetype2)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(freetype) use_prebuilt_binary(freetype)
set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2/) set_target_include_dirs( freetype::freetype ${LIBS_PREBUILT_DIR}/include/freetype2/)
set(FREETYPE_LIBRARIES freetype) set_target_libraries( freetype::freetype freetype )
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
link_directories(${FREETYPE_LIBRARY_DIRS})

11
indra/cmake/GLOD.cmake
View File

@ -1,11 +1,18 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if( TARGET glod::glod )
return()
endif()
create_target( glod::glod )
if (NOT USESYSTEMLIBS) if (NOT USESYSTEMLIBS)
use_prebuilt_binary(glod) use_prebuilt_binary(glod)
endif (NOT USESYSTEMLIBS) endif (NOT USESYSTEMLIBS)
set(GLODLIB ON CACHE BOOL "Using GLOD library") set(GLODLIB ON CACHE BOOL "Using GLOD library")
set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) set_target_include_dirs( glod::glod ${LIBS_PREBUILT_DIR}/include)
set(GLOD_LIBRARIES GLOD) set_target_libraries( glod::glod GLOD )

14
indra/cmake/Hunspell.cmake
View File

@ -1,22 +1,24 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(HUNSPELL_FIND_QUIETLY ON) if( TARGET hunspell::hunspell )
set(HUNSPELL_FIND_REQUIRED ON) return()
endif()
create_target( hunspell::hunspell )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindHUNSPELL) include(FindHUNSPELL)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(libhunspell) use_prebuilt_binary(libhunspell)
if (WINDOWS) if (WINDOWS)
set(HUNSPELL_LIBRARY libhunspell) set_target_libraries( hunspell::hunspell libhunspell)
elseif(DARWIN) elseif(DARWIN)
set(HUNSPELL_LIBRARY hunspell-1.3) set_target_libraries( hunspell::hunspell hunspell-1.3)
elseif(LINUX) elseif(LINUX)
set(HUNSPELL_LIBRARY hunspell-1.3) set_target_libraries( hunspell::hunspell hunspell-1.3)
else() else()
message(FATAL_ERROR "Invalid platform") message(FATAL_ERROR "Invalid platform")
endif() endif()
set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) set_target_include_dirs( hunspell::hunspell ${LIBS_PREBUILT_DIR}/include/hunspell)
use_prebuilt_binary(dictionaries) use_prebuilt_binary(dictionaries)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

15
indra/cmake/JPEG.cmake
View File

@ -2,19 +2,22 @@
include(Prebuilt) include(Prebuilt)
include(Linking) include(Linking)
set(JPEG_FIND_QUIETLY ON)
set(JPEG_FIND_REQUIRED ON) if( TARGET jpeglib::jpeglib )
return()
endif()
create_target(jpeglib::jpeglib)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindJPEG) include(FindJPEG)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(jpeglib) use_prebuilt_binary(jpeglib)
if (LINUX) if (LINUX)
set(JPEG_LIBRARIES jpeg) set_target_libraries( jpeglib::jpeglib jpeg)
elseif (DARWIN) elseif (DARWIN)
set(JPEG_LIBRARIES jpeg) set_target_libraries( jpeglib::jpeglib jpeg)
elseif (WINDOWS) elseif (WINDOWS)
set(JPEG_LIBRARIES jpeglib) set_target_libraries( jpeglib::jpeglib jpeglib)
endif (LINUX) endif (LINUX)
set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set_target_include_dirs( jpeglib::jpeglib ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

17
indra/cmake/JsonCpp.cmake
View File

@ -1,22 +1,21 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if( TARGET jsoncpp::jsoncpp )
set(JSONCPP_FIND_QUIETLY ON) return()
set(JSONCPP_FIND_REQUIRED ON) endif()
create_target( jsoncpp::jsoncpp)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindJsonCpp) include(FindJsonCpp)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(jsoncpp) use_prebuilt_binary(jsoncpp)
if (WINDOWS) if (WINDOWS)
set(JSONCPP_LIBRARIES set_target_libraries( jsoncpp::jsoncpp json_libmd.lib )
debug json_libmdd.lib
optimized json_libmd.lib)
elseif (DARWIN) elseif (DARWIN)
set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) set_target_libraries( jsoncpp::jsoncpp libjson_darwin_libmt.a )
elseif (LINUX) elseif (LINUX)
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) set_target_libraries( jsoncpp::jsoncpp libjson_linux-gcc-4.1.3_libmt.a )
endif (WINDOWS) endif (WINDOWS)
set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") set_target_include_dirs( jsoncpp::jsoncpp ${LIBS_PREBUILT_DIR}/include/json)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

38
indra/cmake/LLAddBuildTest.cmake
View File

@ -36,30 +36,29 @@ INCLUDE(GoogleMock)
) )
SET(alltest_DEP_TARGETS SET(alltest_DEP_TARGETS
# needed by the test harness itself # needed by the test harness itself
${APRUTIL_LIBRARIES}
${APR_LIBRARIES}
llcommon llcommon
) )
SET(alltest_INCLUDE_DIRS
${LIBS_OPEN_DIR}/test
${GOOGLEMOCK_INCLUDE_DIRS}
)
SET(alltest_LIBRARIES
llcommon
${GOOGLEMOCK_LIBRARIES}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
)
IF(NOT "${project}" STREQUAL "llmath") IF(NOT "${project}" STREQUAL "llmath")
# add llmath as a dep unless the tested module *is* llmath! # add llmath as a dep unless the tested module *is* llmath!
LIST(APPEND alltest_DEP_TARGETS LIST(APPEND alltest_DEP_TARGETS
llmath llmath
) )
LIST(APPEND alltest_LIBRARIES
llmath
)
ENDIF(NOT "${project}" STREQUAL "llmath") ENDIF(NOT "${project}" STREQUAL "llmath")
SET(alltest_INCLUDE_DIRS
${LLMATH_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LIBS_OPEN_DIR}/test
${GOOGLEMOCK_INCLUDE_DIRS}
)
SET(alltest_LIBRARIES
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
${GOOGLEMOCK_LIBRARIES}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
)
# Headers, for convenience in targets. # Headers, for convenience in targets.
SET(alltest_HEADER_FILES SET(alltest_HEADER_FILES
${CMAKE_SOURCE_DIR}/test/test.h ${CMAKE_SOURCE_DIR}/test/test.h
@ -126,7 +125,8 @@ INCLUDE(GoogleMock)
MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_LIBRARIES ${${name}_test_additional_LIBRARIES}") MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_LIBRARIES ${${name}_test_additional_LIBRARIES}")
ENDIF(LL_TEST_VERBOSE) ENDIF(LL_TEST_VERBOSE)
# Add to project # Add to project
TARGET_LINK_LIBRARIES(PROJECT_${project}_TEST_${name} ${alltest_LIBRARIES} ${alltest_DEP_TARGETS} ${${name}_test_additional_PROJECTS} ${${name}_test_additional_LIBRARIES} ) TARGET_LINK_LIBRARIES(PROJECT_${project}_TEST_${name} ${alltest_LIBRARIES} ${${name}_test_additional_PROJECTS} ${${name}_test_additional_LIBRARIES} )
add_dependencies( PROJECT_${project}_TEST_${name} ${alltest_DEP_TARGETS})
# Compile-time Definitions # Compile-time Definitions
GET_OPT_SOURCE_FILE_PROPERTY(${name}_test_additional_CFLAGS ${source} LL_TEST_ADDITIONAL_CFLAGS) GET_OPT_SOURCE_FILE_PROPERTY(${name}_test_additional_CFLAGS ${source} LL_TEST_ADDITIONAL_CFLAGS)
SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name}

12
indra/cmake/LLAppearance.cmake
View File

@ -2,26 +2,14 @@
include(Variables) include(Variables)
include(Boost) include(Boost)
include(LLMessage)
include(LLCoreHttp) include(LLCoreHttp)
set(LLAPPEARANCE_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llappearance
)
if (BUILD_HEADLESS) if (BUILD_HEADLESS)
set(LLAPPEARANCE_HEADLESS_LIBRARIES set(LLAPPEARANCE_HEADLESS_LIBRARIES
llappearanceheadless llappearanceheadless
) )
endif (BUILD_HEADLESS) endif (BUILD_HEADLESS)
set(LLAPPEARANCE_LIBRARIES llappearance
llmessage
llcorehttp
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
)

7
indra/cmake/LLAudio.cmake
View File

@ -1,10 +1,3 @@
# -*- cmake -*- # -*- cmake -*-
include(Audio) include(Audio)
set(LLAUDIO_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llaudio
)
# be exhaustive here
set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})

7
indra/cmake/LLCharacter.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLCHARACTER_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llcharacter
)
set(LLCHARACTER_LIBRARIES llcharacter)

35
indra/cmake/LLCommon.cmake
View File

@ -4,36 +4,5 @@ include(APR)
include(Boost) include(Boost)
include(EXPAT) include(EXPAT)
include(ZLIBNG) include(ZLIBNG)
include(JsonCpp)
set(LLCOMMON_INCLUDE_DIRS include(XmlRpcEpi)
${LIBS_OPEN_DIR}/llcommon
${APRUTIL_INCLUDE_DIR}
${APR_INCLUDE_DIR}
)
set(LLCOMMON_SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
)
if (LINUX)
# In order to support using ld.gold on linux, we need to explicitely
# specify all libraries that llcommon uses.
# llcommon uses `clock_gettime' which is provided by librt on linux.
set(LLCOMMON_LIBRARIES llcommon
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
rt
)
else (LINUX)
set(LLCOMMON_LIBRARIES llcommon
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY} )
endif (LINUX)
set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.")
if(LLCOMMON_LINK_SHARED)
add_definitions(-DLL_COMMON_LINK_SHARED=1)
endif(LLCOMMON_LINK_SHARED)

14
indra/cmake/LLCoreHttp.cmake
View File

@ -2,16 +2,4 @@
include(CURL) include(CURL)
include(OpenSSL) include(OpenSSL)
include(Boost) include(NGHTTP2)
set(LLCOREHTTP_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llcorehttp
${CURL_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS}
${BOOST_INCLUDE_DIRS}
)
set(LLCOREHTTP_LIBRARIES llcorehttp
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY})

7
indra/cmake/LLCrashLogger.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLCRASHLOGGER_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llcrashlogger
)
set(LLCRASHLOGGER_LIBRARIES llcrashlogger)

7
indra/cmake/LLFileSystem.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLFILESYSTEM_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llfilesystem
)
set(LLFILESYSTEM_LIBRARIES llfilesystem)

9
indra/cmake/LLImage.cmake
View File

@ -1,11 +1,4 @@
# -*- cmake -*- # -*- cmake -*-
include(JPEG) #include(JPEG)
include(PNG) include(PNG)
set(LLIMAGE_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llimage
${JPEG_INCLUDE_DIRS}
)
set(LLIMAGE_LIBRARIES llimage)

5
indra/cmake/LLImageJ2COJ.cmake
View File

@ -1,5 +0,0 @@
# -*- cmake -*-
include(OpenJPEG)
set(LLIMAGEJ2COJ_LIBRARIES llimagej2coj)

7
indra/cmake/LLInventory.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLINVENTORY_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llinventory
)
set(LLINVENTORY_LIBRARIES llinventory)

18
indra/cmake/LLKDU.cmake
View File

@ -7,15 +7,23 @@ if (INSTALL_PROPRIETARY)
set(USE_KDU ON CACHE BOOL "Use Kakadu library.") set(USE_KDU ON CACHE BOOL "Use Kakadu library.")
endif (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY)
if( TARGET kdu::kdu )
return()
endif()
create_target( kdu::kdu )
if (USE_KDU) if (USE_KDU)
include(Prebuilt) include(Prebuilt)
use_prebuilt_binary(kdu) use_prebuilt_binary(kdu)
if (WINDOWS) if (WINDOWS)
set(KDU_LIBRARY kdu.lib) set_target_libraries( kdu::kdu kdu.lib)
else (WINDOWS) else (WINDOWS)
set(KDU_LIBRARY libkdu.a) set_target_libraries( kdu::kdu libkdu.a)
endif (WINDOWS) endif (WINDOWS)
set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu) set_target_libraries( kdu::kdu kdu.lib)
set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
set(LLKDU_LIBRARIES llkdu) set_target_include_dirs( kdu::kdu
${AUTOBUILD_INSTALL_DIR}/include/kdu
${LIBS_OPEN_DIR}/llkdu
)
endif (USE_KDU) endif (USE_KDU)

7
indra/cmake/LLLogin.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLLOGIN_INCLUDE_DIRS
${LIBS_OPEN_DIR}/viewer_components/login
)
set(LLLOGIN_LIBRARIES lllogin)

13
indra/cmake/LLMessage.cmake
View File

@ -1,13 +0,0 @@
# -*- cmake -*-
include(CURL)
include(OpenSSL)
include(XmlRpcEpi)
set(LLMESSAGE_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llmessage
${CURL_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS}
)
set(LLMESSAGE_LIBRARIES llmessage)

16
indra/cmake/LLPhysicsExtensions.cmake
View File

@ -10,6 +10,11 @@ if (INSTALL_PROPRIETARY)
set(HAVOK ON CACHE BOOL "Use Havok physics library") set(HAVOK ON CACHE BOOL "Use Havok physics library")
endif (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY)
if(TARGET llphysicsextensions )
return()
endif()
create_target(llphysicsextensions)
# Note that the use_prebuilt_binary macros below do not in fact include binaries; # Note that the use_prebuilt_binary macros below do not in fact include binaries;
# the llphysicsextensions_* packages are source only and are built here. # the llphysicsextensions_* packages are source only and are built here.
@ -19,17 +24,14 @@ if (HAVOK)
include(Havok) include(Havok)
use_prebuilt_binary(llphysicsextensions_source) use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions) set_target_libraries( llphysicsextensions llphysicsextensions)
elseif (HAVOK_TPV) elseif (HAVOK_TPV)
use_prebuilt_binary(llphysicsextensions_tpv) use_prebuilt_binary(llphysicsextensions_tpv)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions_tpv) set_target_libraries( llphysicsextensions llphysicsextensions_tpv)
else (HAVOK) else (HAVOK)
use_prebuilt_binary(llphysicsextensions_stub) use_prebuilt_binary(llphysicsextensions_stub)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensionsstub) set_target_libraries( llphysicsextensions llphysicsextensionsstub)
endif (HAVOK) endif (HAVOK)
set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) set_target_include_dirs(llphysicsextensions ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)

14
indra/cmake/LLPlugin.cmake
View File

@ -1,14 +0,0 @@
# -*- cmake -*-
set(LLPLUGIN_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llplugin
)
if (LINUX)
# In order to support using ld.gold on linux, we need to explicitely
# specify all libraries that llplugin uses.
set(LLPLUGIN_LIBRARIES llplugin pthread)
else (LINUX)
set(LLPLUGIN_LIBRARIES llplugin)
endif (LINUX)

72
indra/cmake/LLPrimitive.cmake
View File

@ -4,49 +4,41 @@
include(Prebuilt) include(Prebuilt)
include(Boost) include(Boost)
if( TARGET colladadom::colladadom )
return()
endif()
use_prebuilt_binary(colladadom) use_prebuilt_binary(colladadom)
use_prebuilt_binary(minizip-ng) # needed for colladadom use_prebuilt_binary(minizip-ng) # needed for colladadom
use_prebuilt_binary(pcre) use_prebuilt_binary(pcre)
use_prebuilt_binary(libxml2) use_prebuilt_binary(libxml2)
set(LLPRIMITIVE_INCLUDE_DIRS create_target( pcre::pcre )
${LIBS_OPEN_DIR}/llprimitive set_target_libraries( pcre::pcre pcrecpp pcre )
)
if (WINDOWS)
set(LLPRIMITIVE_LIBRARIES
debug llprimitive
optimized llprimitive
debug libcollada14dom23-sd
optimized libcollada14dom23-s
libxml2_a
debug pcrecppd
optimized pcrecpp
debug pcred
optimized pcre
debug libminizip
optimized libminizip
${BOOST_SYSTEM_LIBRARIES}
)
elseif (DARWIN)
set(LLPRIMITIVE_LIBRARIES
llprimitive
debug collada14dom-d
optimized collada14dom
minizip # for collada libminizip.a
xml2
pcrecpp
pcre
iconv # Required by libxml2
)
elseif (LINUX)
set(LLPRIMITIVE_LIBRARIES
llprimitive
debug collada14dom-d
optimized collada14dom
minizip
xml2
pcrecpp
pcre
)
endif (WINDOWS)
create_target( minizip-ng::minizip-ng )
if (WINDOWS)
set_target_libraries( minizip-ng::minizip-ng libminizip )
else()
set_target_libraries( minizip-ng::minizip-ng minizip )
endif()
create_target( libxml::libxml )
if (WINDOWS)
set_target_libraries( libxml::libxml libxml2_a)
else()
set_target_libraries( libxml::libxml xml2)
endif()
create_target( colladadom::colladadom )
set_target_include_dirs( colladadom::colladadom
${LIBS_PREBUILT_DIR}/include/collada
${LIBS_PREBUILT_DIR}/include/collada/1.4
)
if (WINDOWS)
set_target_libraries(colladadom::colladadom libcollada14dom23-s libxml::libxml minizip-ng::minizip-ng )
elseif (DARWIN)
set_target_libraries(colladadom::colladadom collada14dom libxml::libxml minizip-ng::minizip-ng)
elseif (LINUX)
set_target_libraries(colladadom::colladadom collada14dom libxml::libxml minizip-ng::minizip-ng)
endif()

20
indra/cmake/LLRender.cmake
View File

@ -1,20 +0,0 @@
# -*- cmake -*-
include(Variables)
include(FreeType)
include(GLH)
set(LLRENDER_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llrender
${GLH_INCLUDE_DIR}
)
if (BUILD_HEADLESS)
set(LLRENDER_HEADLESS_LIBRARIES
llrenderheadless
)
endif (BUILD_HEADLESS)
set(LLRENDER_LIBRARIES
llrender
)

7
indra/cmake/LLUI.cmake
View File

@ -1,7 +0,0 @@
# -*- cmake -*-
set(LLUI_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llui
)
set(LLUI_LIBRARIES llui)

12
indra/cmake/LLWindow.cmake
View File

@ -26,17 +26,5 @@ if (SDL_FOUND)
include_directories(${SDL_INCLUDE_DIR}) include_directories(${SDL_INCLUDE_DIR})
endif (SDL_FOUND) endif (SDL_FOUND)
set(LLWINDOW_INCLUDE_DIRS
${GLEXT_INCLUDE_DIR}
${LIBS_OPEN_DIR}/llwindow
)
if (BUILD_HEADLESS)
set(LLWINDOW_HEADLESS_LIBRARIES
llwindowheadless
)
endif (BUILD_HEADLESS)
set(LLWINDOW_LIBRARIES
llwindow
)

14
indra/cmake/LLXML.cmake
View File

@ -1,14 +0,0 @@
# -*- cmake -*-
include(Boost)
include(EXPAT)
set(LLXML_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llxml
${EXPAT_INCLUDE_DIRS}
)
set(LLXML_SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
)
set(LLXML_LIBRARIES llxml)

17
indra/cmake/LibVLCPlugin.cmake
View File

@ -2,6 +2,11 @@
include(Linking) include(Linking)
include(Prebuilt) include(Prebuilt)
if( TARGET libvlc::libvlc )
return()
endif()
create_target( libvlc::libvlc )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
set(LIBVLCPLUGIN OFF CACHE BOOL set(LIBVLCPLUGIN OFF CACHE BOOL
"LIBVLCPLUGIN support for the llplugin/llmedia test apps.") "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
@ -13,18 +18,18 @@ else (USESYSTEMLIBS)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
set(VLC_PLUGIN_LIBRARIES set_target_libraries( libvlc::libvlc
libvlc.lib libvlc.lib
libvlccore.lib libvlccore.lib
) )
elseif (DARWIN) elseif (DARWIN)
set(VLC_PLUGIN_LIBRARIES set_target_libraries( libvlc::libvlc
libvlc.dylib `` libvlc.dylib
libvlccore.dylib libvlccore.dylib
) )
elseif (LINUX) elseif (LINUX)
# Specify a full path to make sure we get a static link # Specify a full path to make sure we get a static link
set(VLC_PLUGIN_LIBRARIES set_target_libraries( liblvc::libvlc
${LIBS_PREBUILT_DIR}/lib/libvlc.a ${LIBS_PREBUILT_DIR}/lib/libvlc.a
${LIBS_PREBUILT_DIR}/lib/libvlccore.a ${LIBS_PREBUILT_DIR}/lib/libvlccore.a
) )

8
indra/cmake/MediaPluginBase.cmake
View File

@ -1,8 +0,0 @@
# -*- cmake -*-
set(MEDIA_PLUGIN_BASE_INCLUDE_DIRS
${LIBS_OPEN_DIR}/media_plugins/base/
)
set(MEDIA_PLUGIN_BASE_LIBRARIES media_plugin_base)

14
indra/cmake/NDOF.cmake
View File

@ -3,6 +3,11 @@ include(Prebuilt)
set(NDOF ON CACHE BOOL "Use NDOF space navigator joystick library.") set(NDOF ON CACHE BOOL "Use NDOF space navigator joystick library.")
if ( TARGET ndof::ndof )
return()
endif()
create_target( ndof::ndof )
if (NDOF) if (NDOF)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
set(NDOF_FIND_REQUIRED ON) set(NDOF_FIND_REQUIRED ON)
@ -15,22 +20,17 @@ if (NDOF)
endif (WINDOWS OR DARWIN) endif (WINDOWS OR DARWIN)
if (WINDOWS) if (WINDOWS)
set(NDOF_LIBRARY libndofdev) set_target_libraries( ndof::ndof libndofdev)
elseif (DARWIN OR LINUX) elseif (DARWIN OR LINUX)
set(NDOF_LIBRARY ndofdev) set_target_libraries( ndof::ndof ndofdev)
endif (WINDOWS) endif (WINDOWS)
set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
set(NDOF_FOUND 1) set(NDOF_FOUND 1)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
endif (NDOF) endif (NDOF)
if (NDOF_FOUND) if (NDOF_FOUND)
add_definitions(-DLIB_NDOF=1) add_definitions(-DLIB_NDOF=1)
include_directories(${NDOF_INCLUDE_DIR})
else (NDOF_FOUND) else (NDOF_FOUND)
message(STATUS "Building without N-DoF joystick support") message(STATUS "Building without N-DoF joystick support")
set(NDOF_INCLUDE_DIR "")
set(NDOF_LIBRARY "")
endif (NDOF_FOUND) endif (NDOF_FOUND)

16
indra/cmake/NGHTTP2.cmake
View File

@ -1,20 +1,20 @@
include(Prebuilt) include(Prebuilt)
set(NGHTTP2_FIND_QUIETLY ON) if( TARGET nghttp2::nghttp2 )
set(NGHTTP2_FIND_REQUIRED ON) return()
endif()
create_target( nghttp2::nghttp2 )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindNGHTTP2) include(FindNGHTTP2)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(nghttp2) use_prebuilt_binary(nghttp2)
if (WINDOWS) if (WINDOWS)
set(NGHTTP2_LIBRARIES set_target_libraries( nghttp2::nghttp2 ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib)
${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
)
elseif (DARWIN) elseif (DARWIN)
set(NGHTTP2_LIBRARIES libnghttp2.dylib) set_target_libraries( nghttp2::nghttp2 libnghttp2.dylib)
else (WINDOWS) else (WINDOWS)
set(NGHTTP2_LIBRARIES libnghttp2.a) set_target_libraries( nghttp2::nghttp2 libnghttp2.a )
endif (WINDOWS) endif (WINDOWS)
set(NGHTTP2_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/nghttp2) set_target_include_dirs( nghttp2::nghttp2 ${LIBS_PREBUILT_DIR}/include/nghttp2)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

3
indra/cmake/NVAPI.cmake
View File

@ -5,8 +5,9 @@ set(NVAPI ON CACHE BOOL "Use NVAPI.")
if (NVAPI) if (NVAPI)
if (WINDOWS) if (WINDOWS)
create_target( nvapi::nvapi )
set_target_libraries( nvapi::nvapi nvapi)
use_prebuilt_binary(nvapi) use_prebuilt_binary(nvapi)
set(NVAPI_LIBRARY nvapi)
else (WINDOWS) else (WINDOWS)
set(NVAPI_LIBRARY "") set(NVAPI_LIBRARY "")
endif (WINDOWS) endif (WINDOWS)

12
indra/cmake/OPENAL.cmake
View File

@ -9,7 +9,12 @@ else (LINUX)
endif (LINUX) endif (LINUX)
if (OPENAL) if (OPENAL)
set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL") if( TARGET openal::openal )
return()
endif()
create_target( openal::openal )
set_target_include_dirs( openal::openal "${LIBS_PREBUILT_DIR}/include/AL")
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindPkgConfig) include(FindPkgConfig)
include(FindOpenAL) include(FindOpenAL)
@ -18,13 +23,14 @@ if (OPENAL)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(openal) use_prebuilt_binary(openal)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
if(WINDOWS) if(WINDOWS)
set(OPENAL_LIBRARIES set_target_libraries( openal::openal
OpenAL32 OpenAL32
alut alut
) )
else() else()
set(OPENAL_LIBRARIES set_target_libraries( openal::openal
openal openal
alut alut
) )

18
indra/cmake/OpenJPEG.cmake
View File

@ -1,22 +1,16 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(OPENJPEG_FIND_QUIETLY ON) if( TARGET openjpeg::openjpeg )
set(OPENJPEG_FIND_REQUIRED ON) return()
endif()
create_target( openjpeg::openjpeg )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindOpenJPEG) include(FindOpenJPEG)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(openjpeg) use_prebuilt_binary(openjpeg)
if(WINDOWS) set_target_libraries(openjpeg::openjpeg openjpeg )
# Windows has differently named release and debug openjpeg(d) libs. set_target_include_dirs( openjpeg::openjpeg ${LIBS_PREBUILT_DIR}/include/openjpeg)
set(OPENJPEG_LIBRARIES
debug openjpegd
optimized openjpeg)
else(WINDOWS)
set(OPENJPEG_LIBRARIES openjpeg)
endif(WINDOWS)
set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

21
indra/cmake/OpenSSL.cmake
View File

@ -1,23 +1,22 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(OpenSSL_FIND_QUIETLY ON) if( TARGET openssl::openssl )
set(OpenSSL_FIND_REQUIRED ON) return()
endif()
create_target(openssl::openssl)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindOpenSSL) include(FindOpenSSL)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(openssl) use_prebuilt_binary(openssl)
if (WINDOWS) if (WINDOWS)
set(OPENSSL_LIBRARIES libssl libcrypto) set_target_libraries(openssl::openssl libssl libcrypto)
else (WINDOWS) elseif (LINUX)
set(OPENSSL_LIBRARIES ssl crypto) set_target_libraries(openssl::openssl ssl crypto dl)
else()
set_target_libraries(openssl::openssl ssl crypto)
endif (WINDOWS) endif (WINDOWS)
set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set_target_include_dirs(openssl::openssl ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
if (LINUX)
set(CRYPTO_LIBRARIES crypto dl)
elseif (DARWIN)
set(CRYPTO_LIBRARIES crypto)
endif (LINUX)

26
indra/cmake/PNG.cmake
View File

@ -1,6 +1,11 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if( TARGET libpng::libpng )
return()
endif()
create_target(libpng::libpng)
set(PNG_FIND_QUIETLY ON) set(PNG_FIND_QUIETLY ON)
set(PNG_FIND_REQUIRED ON) set(PNG_FIND_REQUIRED ON)
@ -9,26 +14,9 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(libpng) use_prebuilt_binary(libpng)
if (WINDOWS) if (WINDOWS)
set(PNG_LIBRARIES libpng16) set_target_libraries(libpng::libpng libpng16)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
elseif(DARWIN)
set(PNG_LIBRARIES png16)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
else() else()
#
# When we have updated static libraries in competition with older
# shared libraries and we want the former to win, we need to do some
# extra work. The *_PRELOAD_ARCHIVES settings are invoked early
# and will pull in the entire archive to the binary giving it
# priority in symbol resolution. Beware of cmake moving the
# achive load itself to another place on the link command line. If
# that happens, you can try something like -Wl,-lpng16 here to hide
# the archive. Also be aware that the linker will not tolerate a
# second whole-archive load of the archive. See viewer's
# CMakeLists.txt for more information.
#
set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive)
set(PNG_LIBRARIES png16) set(PNG_LIBRARIES png16)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
endif() endif()
set_target_include_dirs( libpng::libpng ${LIBS_PREBUILT_DIR}/include/libpng16)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

11
indra/cmake/Prebuilt.cmake
View File

@ -61,4 +61,15 @@ macro (use_prebuilt_binary _binary)
endif (NOT USESYSTEMLIBS_${_binary}) endif (NOT USESYSTEMLIBS_${_binary})
endmacro (use_prebuilt_binary _binary) 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()
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

29
indra/cmake/URIPARSER.cmake
View File

@ -1,7 +1,9 @@
# -*- cmake -*- # -*- cmake -*-
set(URIPARSER_FIND_QUIETLY ON) if( TARGET uriparser::uriparser )
set(URIPARSER_FIND_REQUIRED ON) return()
endif()
create_target( uriparser::uriparser )
include(Prebuilt) include(Prebuilt)
@ -10,26 +12,11 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(uriparser) use_prebuilt_binary(uriparser)
if (WINDOWS) if (WINDOWS)
set(URIPARSER_LIBRARIES set_target_libraries( uriparser::uriparser uriparser)
debug uriparserd
optimized uriparser)
elseif (LINUX) elseif (LINUX)
# set_target_libraries( uriparser::uriparser uriparser)
# When we have updated static libraries in competition with older
# shared libraries and we want the former to win, we need to do some
# extra work. The *_PRELOAD_ARCHIVES settings are invoked early
# and will pull in the entire archive to the binary giving it.
# priority in symbol resolution. Beware of cmake moving the
# achive load itself to another place on the link command line. If
# that happens, you can try something like -Wl,-luriparser here to hide
# the archive. Also be aware that the linker will not tolerate a
# second whole-archive load of the archive. See viewer's
# CMakeLists.txt for more information.
#
set(URIPARSER_PRELOAD_ARCHIVES -Wl,--whole-archive uriparser -Wl,--no-whole-archive)
set(URIPARSER_LIBRARIES uriparser)
elseif (DARWIN) elseif (DARWIN)
set(URIPARSER_LIBRARIES liburiparser.dylib) set_target_libraries( uriparser::uriparser liburiparser.dylib)
endif (WINDOWS) endif (WINDOWS)
set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser) set_target_include_dirs( uriparser::uriparser ${LIBS_PREBUILT_DIR}/include/uriparser)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

17
indra/cmake/XmlRpcEpi.cmake
View File

@ -1,20 +1,15 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(XMLRPCEPI_FIND_QUIETLY ON) if( TARGET xmlrpc-epi::xmlrpc-epi )
set(XMLRPCEPI_FIND_REQUIRED ON) return()
endif()
create_target( xmlrpc-epi::xmlrpc-epi )
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindXmlRpcEpi) include(FindXmlRpcEpi)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(xmlrpc-epi) use_prebuilt_binary(xmlrpc-epi)
if (WINDOWS) set_target_libraries(xmlrpc-epi::xmlrpc-epi xmlrpc-epi )
set(XMLRPCEPI_LIBRARIES set_target_include_dirs( xmlrpc-epi::xmlrpc-epi ${LIBS_PREBUILT_DIR}/include)
debug xmlrpc-epid
optimized xmlrpc-epi
)
else (WINDOWS)
set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
endif (WINDOWS)
set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

33
indra/cmake/ZLIBNG.cmake
View File

@ -1,35 +1,20 @@
# -*- cmake -*- # -*- cmake -*-
set(ZLIBNG_FIND_QUIETLY ON)
set(ZLIBNG_FIND_REQUIRED ON)
include(Prebuilt) include(Prebuilt)
if( TARGET zlib-ng::zlib-ng )
return()
endif()
create_target(zlib-ng::zlib-ng)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
include(FindZLIBNG) include(FindZLIBNG)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(zlib-ng) use_prebuilt_binary(zlib-ng)
if (WINDOWS) if (WINDOWS)
set(ZLIBNG_LIBRARIES set_target_libraries( zlib-ng::zlib-ng zlib )
debug zlib else()
optimized zlib) set_target_libraries( zlib-ng::zlib-ng z )
elseif (LINUX)
#
# When we have updated static libraries in competition with older
# shared libraries and we want the former to win, we need to do some
# extra work. The *_PRELOAD_ARCHIVES settings are invoked early
# and will pull in the entire archive to the binary giving it
# priority in symbol resolution. Beware of cmake moving the
# achive load itself to another place on the link command line. If
# that happens, you can try something like -Wl,-lz here to hide
# the archive. Also be aware that the linker will not tolerate a
# second whole-archive load of the archive. See viewer's
# CMakeLists.txt for more information.
#
set(ZLIBNG_PRELOAD_ARCHIVES -Wl,--whole-archive z -Wl,--no-whole-archive)
set(ZLIBNG_LIBRARIES z)
elseif (DARWIN)
set(ZLIBNG_LIBRARIES z)
endif (WINDOWS) endif (WINDOWS)
set(ZLIBNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib-ng) set_target_include_dirs( zlib-ng::zlib-ng ${LIBS_PREBUILT_DIR}/include/zlib-ng)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)

10
indra/cmake/bugsplat.cmake
View File

@ -10,28 +10,30 @@ else (INSTALL_PROPRIETARY)
endif (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY)
if (USE_BUGSPLAT) if (USE_BUGSPLAT)
create_target(bugsplat::bugsplat)
if (NOT USESYSTEMLIBS) if (NOT USESYSTEMLIBS)
include(Prebuilt) include(Prebuilt)
use_prebuilt_binary(bugsplat) use_prebuilt_binary(bugsplat)
if (WINDOWS) if (WINDOWS)
set(BUGSPLAT_LIBRARIES set_target_libraries( bugsplat::bugsplat
${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib ${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib
) )
elseif (DARWIN) elseif (DARWIN)
find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}") NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
set_target_libraries( bugsplat::bugsplat
${BUGSPLAT_LIBRARIES}
)
else (WINDOWS) else (WINDOWS)
message(FATAL_ERROR "BugSplat is not supported; add -DUSE_BUGSPLAT=OFF") message(FATAL_ERROR "BugSplat is not supported; add -DUSE_BUGSPLAT=OFF")
endif (WINDOWS) endif (WINDOWS)
else (NOT USESYSTEMLIBS) else (NOT USESYSTEMLIBS)
set(BUGSPLAT_FIND_QUIETLY ON)
set(BUGSPLAT_FIND_REQUIRED ON)
include(FindBUGSPLAT) include(FindBUGSPLAT)
endif (NOT USESYSTEMLIBS) endif (NOT USESYSTEMLIBS)
set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name") set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name")
set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/bugsplat) set_target_include_dirs( bugsplat::bugsplat ${LIBS_PREBUILT_DIR}/include/bugsplat)
set(BUGSPLAT_DEFINE "LL_BUGSPLAT") set(BUGSPLAT_DEFINE "LL_BUGSPLAT")
endif (USE_BUGSPLAT) endif (USE_BUGSPLAT)

64
indra/llappearance/CMakeLists.txt
View File

@ -4,30 +4,11 @@ project(llappearance)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLCharacter)
include(LLImage) include(LLImage)
include(LLInventory)
include(LLMath)
include(LLMessage)
include(LLCoreHttp) include(LLCoreHttp)
include(LLRender)
include(LLFileSystem)
include(LLWindow) include(LLWindow)
include(LLXML)
include(Linking) include(Linking)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCHARACTER_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLINVENTORY_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
set(llappearance_SOURCE_FILES set(llappearance_SOURCE_FILES
llavatarappearance.cpp llavatarappearance.cpp
llavatarjoint.cpp llavatarjoint.cpp
@ -79,33 +60,32 @@ list(APPEND llappearance_SOURCE_FILES ${llappearance_HEADER_FILES})
add_library (llappearance ${llappearance_SOURCE_FILES}) add_library (llappearance ${llappearance_SOURCE_FILES})
target_link_libraries(llappearance target_link_libraries(llappearance
${LLCHARACTER_LIBRARIES} llcharacter
${LLINVENTORY_LIBRARIES} llinventory
${LLIMAGE_LIBRARIES} llimage
${LLRENDER_LIBRARIES} llrender
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${LLXML_LIBRARIES} llxml
${LLMATH_LIBRARIES} llmessage
${LLMESSAGE_LIBRARIES} llcorehttp
${LLCOREHTTP_LIBRARIES} llcommon
${LLCOMMON_LIBRARIES}
) )
set_target_include_dirs( llappearance ${CMAKE_CURRENT_SOURCE_DIR})
if (BUILD_HEADLESS) if (BUILD_HEADLESS)
add_library (llappearanceheadless ${llappearance_SOURCE_FILES}) add_library (llappearanceheadless ${llappearance_SOURCE_FILES})
set_target_include_dirs( llappearanceheadless ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(llappearanceheadless target_link_libraries(llappearanceheadless
${LLCHARACTER_LIBRARIES} llcharacter
${LLINVENTORY_LIBRARIES} llinventory
${LLIMAGE_LIBRARIES} llimage
${LLRENDERHEADLESS_LIBRARIES} llfilesystem
${LLFILESYSTEM_LIBRARIES} llmath
${LLMATH_LIBRARIES} llxml
${LLXML_LIBRARIES} llmessage
${LLMATH_LIBRARIES} llcorehttp
${LLMESSAGE_LIBRARIES} llcommon
${LLCOREHTTP_LIBRARIES}
${LLCOMMON_LIBRARIES}
) )
endif (BUILD_HEADLESS) endif (BUILD_HEADLESS)

48
indra/llaudio/CMakeLists.txt
View File

@ -7,23 +7,6 @@ include(LLAudio)
include(FMODSTUDIO) include(FMODSTUDIO)
include(OPENAL) include(OPENAL)
include(LLCommon) include(LLCommon)
include(LLMath)
include(LLMessage)
include(LLFileSystem)
include_directories(
${LLAUDIO_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${OGG_INCLUDE_DIRS}
${VORBISENC_INCLUDE_DIRS}
${VORBISFILE_INCLUDE_DIRS}
${VORBIS_INCLUDE_DIRS}
${OPENAL_LIB_INCLUDE_DIRS}
${FREEAULT_LIB_INCLUDE_DIRS}
)
set(llaudio_SOURCE_FILES set(llaudio_SOURCE_FILES
llaudioengine.cpp llaudioengine.cpp
@ -43,9 +26,6 @@ set(llaudio_HEADER_FILES
) )
if (FMODSTUDIO) if (FMODSTUDIO)
include_directories(
${FMODSTUDIO_INCLUDE_DIR}
)
list(APPEND llaudio_SOURCE_FILES list(APPEND llaudio_SOURCE_FILES
llaudioengine_fmodstudio.cpp llaudioengine_fmodstudio.cpp
lllistener_fmodstudio.cpp lllistener_fmodstudio.cpp
@ -60,10 +40,6 @@ if (FMODSTUDIO)
endif (FMODSTUDIO) endif (FMODSTUDIO)
if (OPENAL) if (OPENAL)
include_directories(
${OPENAL_LIBRARIES}
)
list(APPEND llaudio_SOURCE_FILES list(APPEND llaudio_SOURCE_FILES
llaudioengine_openal.cpp llaudioengine_openal.cpp
lllistener_openal.cpp lllistener_openal.cpp
@ -81,14 +57,18 @@ set_source_files_properties(${llaudio_HEADER_FILES}
list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES}) list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
add_library (llaudio ${llaudio_SOURCE_FILES}) add_library (llaudio ${llaudio_SOURCE_FILES})
target_link_libraries( set_target_include_dirs( llaudio ${CMAKE_CURRENT_SOURCE_DIR})
llaudio target_link_libraries( llaudio
${LLCOMMON_LIBRARIES} llcommon
${LLMATH_LIBRARIES} llmath
${LLMESSAGE_LIBRARIES} llmessage
${LLFILESYSTEM_LIBRARIES} llfilesystem
${VORBISENC_LIBRARIES} vorbis::vorbis
${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES}
${OGG_LIBRARIES}
) )
if( TARGET openal::openal )
target_link_libraries( llaudio openal::openal )
endif()
if( TARGET fmodstudio::fmodstudio )
target_link_libraries( llaudio fmodstudio::fmodstudio )
endif()

29
indra/llcharacter/CMakeLists.txt
View File

@ -4,22 +4,6 @@ project(llcharacter)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLMath)
include(LLMessage)
include(LLFileSystem)
include(LLXML)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llcharacter_SOURCE_FILES set(llcharacter_SOURCE_FILES
llanimationstates.cpp llanimationstates.cpp
@ -79,12 +63,13 @@ set_source_files_properties(${llcharacter_HEADER_FILES}
list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES}) list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES})
add_library (llcharacter ${llcharacter_SOURCE_FILES}) add_library (llcharacter ${llcharacter_SOURCE_FILES})
set_target_include_dirs( llcharacter ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
llcharacter llcharacter
${LLCOMMON_LIBRARIES} llcommon
${LLMATH_LIBRARIES} llmath
${LLMESSAGE_LIBRARIES} llmessage
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLXML_LIBRARIES} llxml
) )

37
indra/llcommon/CMakeLists.txt
View File

@ -13,14 +13,6 @@ include(Copy3rdPartyLibs)
include(ZLIBNG) include(ZLIBNG)
include(URIPARSER) include(URIPARSER)
include_directories(
${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIR}
${ZLIBNG_INCLUDE_DIRS}
${URIPARSER_INCLUDE_DIRS}
)
# add_executable(lltreeiterators lltreeiterators.cpp) # add_executable(lltreeiterators lltreeiterators.cpp)
# #
# target_link_libraries(lltreeiterators # target_link_libraries(lltreeiterators
@ -286,22 +278,19 @@ else(LLCOMMON_LINK_SHARED)
endif(LLCOMMON_LINK_SHARED) endif(LLCOMMON_LINK_SHARED)
target_link_libraries( target_link_libraries(
llcommon llcommon
${APRUTIL_LIBRARIES} apr::apr
${APR_LIBRARIES} expat::expat
${EXPAT_LIBRARIES} jsoncpp::jsoncpp
${JSONCPP_LIBRARIES} zlib-ng::zlib-ng
${ZLIBNG_LIBRARIES}
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${BOOST_FIBER_LIBRARY} boost::boost
${BOOST_CONTEXT_LIBRARY}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
${GOOGLE_PERFTOOLS_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES}
${URIPARSER_LIBRARIES} uriparser::uriparser
) )
set_target_include_dirs( llcommon ${CMAKE_CURRENT_SOURCE_DIR})
if (DARWIN) if (DARWIN)
include(CMakeFindFrameworks) include(CMakeFindFrameworks)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
@ -319,13 +308,9 @@ if (LL_TESTS)
#set(TEST_DEBUG on) #set(TEST_DEBUG on)
set(test_libs llcommon set(test_libs llcommon
${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}
${WINDOWS_LIBRARIES}
${GOOGLEMOCK_LIBRARIES} ${GOOGLEMOCK_LIBRARIES}
${BOOST_FIBER_LIBRARY} )
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY})
LL_ADD_INTEGRATION_TEST(bitpack "" "${test_libs}") LL_ADD_INTEGRATION_TEST(bitpack "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(classic_callback "" "${test_libs}") LL_ADD_INTEGRATION_TEST(classic_callback "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}")

2
indra/llcommon/stringize.h
View File

@ -30,7 +30,7 @@
#define LL_STRINGIZE_H #define LL_STRINGIZE_H
#include <sstream> #include <sstream>
#include <llstring.h> #include "llstring.h"
/** /**
* gstringize(item) encapsulates an idiom we use constantly, using * gstringize(item) encapsulates an idiom we use constantly, using

53
indra/llcorehttp/CMakeLists.txt
View File

@ -10,18 +10,11 @@ include(NGHTTP2)
include(ZLIBNG) include(ZLIBNG)
include(LLCoreHttp) include(LLCoreHttp)
include(LLAddBuildTest) include(LLAddBuildTest)
include(LLMessage)
include(LLCommon) include(LLCommon)
include(Tut) include(Tut)
include(bugsplat) include(bugsplat)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../llmessage )
include_directories(
${LLMESSAGE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
)
set(llcorehttp_SOURCE_FILES set(llcorehttp_SOURCE_FILES
bufferarray.cpp bufferarray.cpp
@ -92,14 +85,14 @@ list(APPEND llcorehttp_SOURCE_FILES ${llcorehttp_HEADER_FILES})
add_library (llcorehttp ${llcorehttp_SOURCE_FILES}) add_library (llcorehttp ${llcorehttp_SOURCE_FILES})
target_link_libraries( target_link_libraries(
llcorehttp llcorehttp
${CURL_LIBRARIES} llcommon
${OPENSSL_LIBRARIES} libcurl::libcurl
${CRYPTO_LIBRARIES} openssl::openssl
${NGHTTP2_LIBRARIES} nghttp2::nghttp2
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
) )
set_target_include_dirs( llcorehttp ${CMAKE_CURRENT_SOURCE_DIR})
# tests # tests
set(LLCOREHTTP_TESTS ON CACHE BOOL set(LLCOREHTTP_TESTS ON CACHE BOOL
@ -128,17 +121,10 @@ if (LL_TESTS AND LLCOREHTTP_TESTS)
# set(TEST_DEBUG on) # set(TEST_DEBUG on)
set(test_libs set(test_libs
${LLCOREHTTP_LIBRARIES} llcorehttp
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${LLMESSAGE_LIBRARIES} llmessage
${LLCOMMON_LIBRARIES} llcommon
${GOOGLEMOCK_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${NGHTTP2_LIBRARIES}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
) )
# If http_proxy is in the current environment (e.g. to fetch s3-proxy # If http_proxy is in the current environment (e.g. to fetch s3-proxy
@ -201,17 +187,10 @@ endif (DARWIN)
set(example_libs set(example_libs
${LEGACY_STDIO_LIBS} ${LEGACY_STDIO_LIBS}
${LLCOREHTTP_LIBRARIES} llcorehttp
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${LLMESSAGE_LIBRARIES} llmessage
${LLCOMMON_LIBRARIES} llcommon
${GOOGLEMOCK_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${NGHTTP2_LIBRARIES}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
) )
add_executable(http_texture_load add_executable(http_texture_load

19
indra/llcrashlogger/CMakeLists.txt
View File

@ -5,23 +5,6 @@ project(llcrashlogger)
include(00-Common) include(00-Common)
include(LLCoreHttp) include(LLCoreHttp)
include(LLCommon) include(LLCommon)
include(LLMath)
include(LLMessage)
include(LLFileSystem)
include(LLXML)
include_directories(
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llcrashlogger_SOURCE_FILES set(llcrashlogger_SOURCE_FILES
llcrashlogger.cpp llcrashlogger.cpp
@ -30,7 +13,6 @@ set(llcrashlogger_SOURCE_FILES
set(llcrashlogger_HEADER_FILES set(llcrashlogger_HEADER_FILES
CMakeLists.txt CMakeLists.txt
llcrashlogger.h llcrashlogger.h
llcrashlock.h llcrashlock.h
) )
@ -41,3 +23,4 @@ set_source_files_properties(${llcrashlogger_HEADER_FILES}
list(APPEND llcrashlogger_SOURCE_FILES ${llcrashlogger_HEADER_FILES}) list(APPEND llcrashlogger_SOURCE_FILES ${llcrashlogger_HEADER_FILES})
add_library(llcrashlogger ${llcrashlogger_SOURCE_FILES}) add_library(llcrashlogger ${llcrashlogger_SOURCE_FILES})
target_link_libraries( llcrashlogger llcommon llmessage llcorehttp llxml llfilesystem )

11
indra/llfilesystem/CMakeLists.txt
View File

@ -60,15 +60,10 @@ list(APPEND llfilesystem_SOURCE_FILES ${llfilesystem_HEADER_FILES})
add_library (llfilesystem ${llfilesystem_SOURCE_FILES}) add_library (llfilesystem ${llfilesystem_SOURCE_FILES})
set(cache_BOOST_LIBRARIES
${BOOST_FILESYSTEM_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
)
target_link_libraries(llfilesystem target_link_libraries(llfilesystem
${LLCOMMON_LIBRARIES} llcommon
${cache_BOOST_LIBRARIES}
) )
set_target_include_dirs( llfilesystem ${CMAKE_CURRENT_SOURCE_DIR})
if (DARWIN) if (DARWIN)
include(CMakeFindFrameworks) include(CMakeFindFrameworks)
@ -92,7 +87,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 ${WINDOWS_LIBRARIES})
# 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}")

30
indra/llimage/CMakeLists.txt
View File

@ -5,24 +5,13 @@ project(llimage)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLMath) include(JPEG)
include(LLFileSystem)
include(LLKDU) include(LLKDU)
include(LLImageJ2COJ)
include(ZLIBNG) include(ZLIBNG)
include(LLAddBuildTest) include(LLAddBuildTest)
include(bugsplat) include(bugsplat)
include(Tut) include(Tut)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
${ZLIBNG_INCLUDE_DIRS}
)
set(llimage_SOURCE_FILES set(llimage_SOURCE_FILES
llimagebmp.cpp llimagebmp.cpp
llimage.cpp llimage.cpp
@ -60,21 +49,22 @@ set_source_files_properties(${llimage_HEADER_FILES}
list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES}) list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
add_library (llimage ${llimage_SOURCE_FILES}) add_library (llimage ${llimage_SOURCE_FILES})
set_target_include_dirs( llimage ${CMAKE_CURRENT_SOURCE_DIR})
# Libraries on which this library depends, needed for Linux builds # Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level # Sort by high-level to low-level
if (USE_KDU) if (USE_KDU)
target_link_libraries(llimage ${LLKDU_LIBRARIES}) target_link_libraries(llimage llkdu)
else (USE_KDU) else (USE_KDU)
target_link_libraries(llimage ${LLIMAGEJ2COJ_LIBRARIES}) target_link_libraries(llimage llimagej2coj)
endif (USE_KDU) endif (USE_KDU)
target_link_libraries(llimage target_link_libraries(llimage
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${LLCOMMON_LIBRARIES} llcommon
${JPEG_LIBRARIES} zlib-ng::zlib-ng
${PNG_LIBRARIES} libpng::libpng
${ZLIBNG_LIBRARIES} jpeglib::jpeglib
) )
# Add tests # Add tests

13
indra/llimagej2coj/CMakeLists.txt
View File

@ -7,12 +7,6 @@ include(LLCommon)
include(LLImage) include(LLImage)
include(OpenJPEG) include(OpenJPEG)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${OPENJPEG_INCLUDE_DIR}
)
set(llimagej2coj_SOURCE_FILES set(llimagej2coj_SOURCE_FILES
llimagej2coj.cpp llimagej2coj.cpp
) )
@ -30,8 +24,9 @@ list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES}) add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
target_link_libraries( target_link_libraries( llimagej2coj
llimagej2coj llcommon
${OPENJPEG_LIBRARIES} llimage
openjpeg::openjpeg
) )

16
indra/llinventory/CMakeLists.txt
View File

@ -5,17 +5,6 @@ project(llinventory)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLCoreHttp) include(LLCoreHttp)
include(LLMath)
include(LLMessage)
include(LLFileSystem)
include(LLXML)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
set(llinventory_SOURCE_FILES set(llinventory_SOURCE_FILES
llcategory.cpp llcategory.cpp
@ -70,7 +59,8 @@ list(APPEND llinventory_SOURCE_FILES ${llinventory_HEADER_FILES})
add_library (llinventory ${llinventory_SOURCE_FILES}) add_library (llinventory ${llinventory_SOURCE_FILES})
target_link_libraries( llinventory llcommon llmath llmessage llxml )
set_target_include_dirs( llinventory ${CMAKE_CURRENT_SOURCE_DIR})
#add unit tests #add unit tests
if (LL_TESTS) if (LL_TESTS)
@ -81,7 +71,7 @@ if (LL_TESTS)
LL_ADD_PROJECT_UNIT_TESTS(llinventory "${llinventory_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llinventory "${llinventory_TEST_SOURCE_FILES}")
#set(TEST_DEBUG on) #set(TEST_DEBUG on)
set(test_libs llinventory ${LLMESSAGE_LIBRARIES} ${LLFILESYSTEM_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) set(test_libs llinventory llmath llcorehttp llfilesystem ${WINDOWS_LIBRARIES})
LL_ADD_INTEGRATION_TEST(inventorymisc "" "${test_libs}") LL_ADD_INTEGRATION_TEST(inventorymisc "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llparcel "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llparcel "" "${test_libs}")
endif (LL_TESTS) endif (LL_TESTS)

18
indra/llkdu/CMakeLists.txt
View File

@ -13,15 +13,7 @@ include(00-Common)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLKDU) include(LLKDU)
include(LLMath)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${KDU_INCLUDE_DIR}
${LLKDU_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
)
set(llkdu_SOURCE_FILES set(llkdu_SOURCE_FILES
llimagej2ckdu.cpp llimagej2ckdu.cpp
@ -51,9 +43,8 @@ set_source_files_properties(${llkdu_SOURCE_FILES}
if (USE_KDU) if (USE_KDU)
add_library (llkdu ${llkdu_SOURCE_FILES}) add_library (llkdu ${llkdu_SOURCE_FILES})
target_link_libraries(llkdu target_link_libraries(llkdu kdu::kdu )
${KDU_LIBRARY})
# Add tests # Add tests
if (LL_TESTS) if (LL_TESTS)
include(LLAddBuildTest) include(LLAddBuildTest)
@ -66,10 +57,7 @@ if (USE_KDU)
llkdumem.h llkdumem.h
lltut.h lltut.h
) )
SET(llkdu_test_additional_INCLUDE_DIRS
${KDU_INCLUDE_DIR}
${LLKDU_INCLUDE_DIRS}
)
LL_ADD_PROJECT_UNIT_TESTS(llkdu "${llkdu_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llkdu "${llkdu_TEST_SOURCE_FILES}")
endif (LL_TESTS) endif (LL_TESTS)

13
indra/llmath/CMakeLists.txt
View File

@ -107,9 +107,8 @@ list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES})
add_library (llmath ${llmath_SOURCE_FILES}) add_library (llmath ${llmath_SOURCE_FILES})
target_link_libraries(llmath target_link_libraries(llmath llcommon)
${LLCOMMON_LIBRARIES} set_target_include_dirs( llmath ${CMAKE_CURRENT_SOURCE_DIR})
)
# Add tests # Add tests
if (LL_TESTS) if (LL_TESTS)
@ -124,15 +123,11 @@ if (LL_TESTS)
v4color.cpp v4color.cpp
v4coloru.cpp v4coloru.cpp
) )
set_source_files_properties(
${llmath_TEST_SOURCE_FILES}
PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_THREAD_LIBRARY}"
)
LL_ADD_PROJECT_UNIT_TESTS(llmath "${llmath_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llmath "${llmath_TEST_SOURCE_FILES}")
# INTEGRATION TESTS # INTEGRATION TESTS
set(test_libs llmath llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) set(test_libs llmath llcommon ${WINDOWS_LIBRARIES})
# 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(alignment "" "${test_libs}") LL_ADD_INTEGRATION_TEST(alignment "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llbbox llbbox.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(llbbox llbbox.cpp "${test_libs}")

92
indra/llmessage/CMakeLists.txt
View File

@ -7,9 +7,6 @@ include(GoogleMock)
include(LLAddBuildTest) include(LLAddBuildTest)
include(LLCommon) include(LLCommon)
include(LLCoreHttp) include(LLCoreHttp)
include(LLMath)
include(LLMessage)
include(LLFileSystem)
include(LLAddBuildTest) include(LLAddBuildTest)
include(Python) include(Python)
include(Tut) include(Tut)
@ -19,12 +16,9 @@ include(JsonCpp)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories (${CMAKE_CURRENT_SOURCE_DIR})
include_directories( include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS} ${LLCOREHTTP_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS} ${LLFILESYSTEM_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIR}
) )
set(llmessage_SOURCE_FILES set(llmessage_SOURCE_FILES
@ -204,42 +198,18 @@ list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
add_library (llmessage ${llmessage_SOURCE_FILES}) add_library (llmessage ${llmessage_SOURCE_FILES})
if (LINUX)
target_link_libraries( target_link_libraries(
llmessage llmessage
${CURL_LIBRARIES} libcurl::libcurl
${LLCOMMON_LIBRARIES} llcommon
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${JSONCPP_LIBRARIES} openssl::openssl
${OPENSSL_LIBRARIES} xmlrpc-epi::xmlrpc-epi
${CRYPTO_LIBRARIES} llcorehttp
${NGHTTP2_LIBRARIES} nghttp2::nghttp2
${XMLRPCEPI_LIBRARIES} )
${LLCOREHTTP_LIBRARIES} set_target_include_dirs( llmessage ${CMAKE_CURRENT_SOURCE_DIR})
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
rt
)
else (LINUX)
target_link_libraries(
llmessage
${CURL_LIBRARIES}
${LLCOMMON_LIBRARIES}
${LLFILESYSTEM_LIBRARIES}
${LLMATH_LIBRARIES}
${JSONCPP_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${NGHTTP2_LIBRARIES}
${XMLRPCEPI_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
)
endif(LINUX)
# tests # tests
if (LL_TESTS) if (LL_TESTS)
@ -249,41 +219,29 @@ if (LL_TESTS)
lltrustedmessageservice.cpp lltrustedmessageservice.cpp
lltemplatemessagedispatcher.cpp lltemplatemessagedispatcher.cpp
) )
set_property( SOURCE ${llmessage_TEST_SOURCE_FILES} PROPERTY LL_TEST_ADDITIONAL_LIBRARIES llmath llcorehttp)
LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}")
# set(TEST_DEBUG on) # set(TEST_DEBUG on)
if (LINUX) if (LINUX)
set(test_libs set(test_libs
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${CURL_LIBRARIES} llcorehttp
${NGHTTP2_LIBRARIES} llmessage
${LLCOMMON_LIBRARIES} llcommon
${LLMESSAGE_LIBRARIES} rt
${LLCOREHTTP_LIBRARIES}
${JSONCPP_LIBRARIES}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
rt
${GOOGLEMOCK_LIBRARIES}
) )
else (LINUX) else (LINUX)
set(test_libs set(test_libs
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${CURL_LIBRARIES} llcorehttp
${NGHTTP2_LIBRARIES} llmessage
${LLCOMMON_LIBRARIES} llcommon
${LLMESSAGE_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${JSONCPP_LIBRARIES}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${GOOGLEMOCK_LIBRARIES}
) )
endif(LINUX) endif(LINUX)

22
indra/llplugin/CMakeLists.txt
View File

@ -6,26 +6,7 @@ include(00-Common)
include(CURL) include(CURL)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLMath)
include(LLMessage)
include(LLRender)
include(LLXML)
include(LLWindow) include(LLWindow)
include(Boost)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llplugin_SOURCE_FILES set(llplugin_SOURCE_FILES
llpluginclassmedia.cpp llpluginclassmedia.cpp
@ -65,6 +46,7 @@ endif(NOT ADDRESS_SIZE EQUAL 32)
list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES}) list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
add_library (llplugin ${llplugin_SOURCE_FILES}) add_library (llplugin ${llplugin_SOURCE_FILES})
set_target_include_dirs(llplugin ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( llplugin llcommon llmath llrender llmessage )
add_subdirectory(slplugin) add_subdirectory(slplugin)

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

@ -2,19 +2,8 @@ project(SLPlugin)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLPlugin)
include(Linking) include(Linking)
include(PluginAPI) include(PluginAPI)
include(LLMessage)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
if (DARWIN) if (DARWIN)
include(CMakeFindFrameworks) include(CMakeFindFrameworks)
@ -63,10 +52,10 @@ set_target_properties(SLPlugin
endif () endif ()
target_link_libraries(SLPlugin target_link_libraries(SLPlugin
${LEGACY_STDIO_LIBS} ${LEGACY_STDIO_LIBS}
${LLPLUGIN_LIBRARIES} llplugin
${LLMESSAGE_LIBRARIES} llmessage
${LLCOMMON_LIBRARIES} llcommon
${PLUGIN_API_WINDOWS_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES}
) )

42
indra/llprimitive/CMakeLists.txt
View File

@ -4,27 +4,9 @@ project(llprimitive)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLMath)
include(LLMessage)
include(LLCoreHttp) include(LLCoreHttp)
include(LLXML)
include(LLPhysicsExtensions) include(LLPhysicsExtensions)
include(LLCharacter) include(LLPrimitive)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LIBS_PREBUILT_DIR}/include/collada
${LIBS_PREBUILT_DIR}/include/collada/1.4
${LLCHARACTER_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
)
set(llprimitive_SOURCE_FILES set(llprimitive_SOURCE_FILES
lldaeloader.cpp lldaeloader.cpp
@ -71,19 +53,19 @@ set_source_files_properties(${llprimitive_HEADER_FILES}
list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES}) list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES})
add_library (llprimitive ${llprimitive_SOURCE_FILES}) add_library (llprimitive ${llprimitive_SOURCE_FILES})
set_target_include_dirs( llprimitive ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(llprimitive target_link_libraries(llprimitive
${LLCOMMON_LIBRARIES} llcommon
${LLMATH_LIBRARIES} llmath
${LLMESSAGE_LIBRARIES} llmessage
${LLCOREHTTP_LIBRARIES} llcorehttp
${LLXML_LIBRARIES} llxml
${LLPHYSICSEXTENSIONS_LIBRARIES} llcharacter
${LLCHARACTER_LIBRARIES} llphysicsextensions
${BOOST_FIBER_LIBRARY} colladadom::colladadom
${BOOST_CONTEXT_LIBRARY} pcre::pcre
) )
#add unit tests #add unit tests
if (LL_TESTS) if (LL_TESTS)

56
indra/llrender/CMakeLists.txt
View File

@ -7,26 +7,7 @@ include(OpenGL)
include(FreeType) include(FreeType)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLMath)
include(LLRender)
include(LLWindow) include(LLWindow)
include(LLXML)
include(LLFileSystem)
include_directories(
${FREETYPE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llrender_SOURCE_FILES set(llrender_SOURCE_FILES
llatmosphere.cpp llatmosphere.cpp
@ -98,18 +79,17 @@ if (BUILD_HEADLESS)
) )
target_link_libraries(llrenderheadless target_link_libraries(llrenderheadless
${LLCOMMON_LIBRARIES} llcommon
${LLIMAGE_LIBRARIES} llimage
${LLMATH_LIBRARIES} llmath
${LLRENDER_HEADLESS_LIBRARIES} llrender
${LLXML_LIBRARIES} llxml
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLWINDOW_HEADLESS_LIBRARIES} )
${OPENGL_HEADLESS_LIBRARIES})
endif (BUILD_HEADLESS) endif (BUILD_HEADLESS)
add_library (llrender ${llrender_SOURCE_FILES}) add_library (llrender ${llrender_SOURCE_FILES})
set_target_include_dirs(llrender ${CMAKE_CURRENT_SOURCE_DIR})
if (SDL_FOUND) if (SDL_FOUND)
set_property(TARGET llrender set_property(TARGET llrender
@ -119,13 +99,15 @@ endif (SDL_FOUND)
# Libraries on which this library depends, needed for Linux builds # Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level # Sort by high-level to low-level
target_link_libraries(llrender target_link_libraries(llrender
${LLCOMMON_LIBRARIES} llcommon
${LLIMAGE_LIBRARIES} llimage
${LLMATH_LIBRARIES} llmath
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLXML_LIBRARIES} llxml
${LLWINDOW_LIBRARIES} llwindow
${FREETYPE_LIBRARIES} freetype::freetype
${OPENGL_LIBRARIES}) OpenGL::GL
OpenGL::GLU
)

59
indra/llui/CMakeLists.txt
View File

@ -6,33 +6,9 @@ include(00-Common)
include(Hunspell) include(Hunspell)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLInventory)
include(LLMath)
include(LLMessage)
include(LLCoreHttp) include(LLCoreHttp)
include(LLRender)
include(LLWindow) include(LLWindow)
include(LLCoreHttp) include(LLCoreHttp)
include(LLFileSystem)
include(LLXML)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLINVENTORY_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LIBS_PREBUILD_DIR}/include/hunspell
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llui_SOURCE_FILES set(llui_SOURCE_FILES
llaccordionctrl.cpp llaccordionctrl.cpp
@ -276,38 +252,37 @@ set_source_files_properties(llurlentry.cpp
list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES}) list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
add_library (llui ${llui_SOURCE_FILES}) add_library (llui ${llui_SOURCE_FILES})
set_target_include_dirs( llui ${CMAKE_CURRENT_SOURCE_DIR})
# Libraries on which this library depends, needed for Linux builds # Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level # Sort by high-level to low-level
target_link_libraries(llui target_link_libraries(llui
${LLRENDER_LIBRARIES} llrender
${LLWINDOW_LIBRARIES} llwindow
${LLIMAGE_LIBRARIES} llimage
${LLINVENTORY_LIBRARIES} llinventory
${LLMESSAGE_LIBRARIES} llmessage
${LLCOREHTTP_LIBRARIES} llcorehttp
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLXUIXML_LIBRARIES} llxml
${LLXML_LIBRARIES} llmath
${LLMATH_LIBRARIES} hunspell::hunspell
${HUNSPELL_LIBRARY} llcommon
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
) )
# Add tests # Add tests
if(LL_TESTS) if(LL_TESTS)
include(LLAddBuildTest) include(LLAddBuildTest)
set(test_libs llmessage llcorehttp llxml llrender llcommon hunspell::hunspell ${WINDOWS_LIBRARIES})
SET(llui_TEST_SOURCE_FILES SET(llui_TEST_SOURCE_FILES
llurlmatch.cpp llurlmatch.cpp
) )
set_property( SOURCE ${llui_TEST_SOURCE_FILES} PROPERTY LL_TEST_ADDITIONAL_LIBRARIES ${test_libs})
LL_ADD_PROJECT_UNIT_TESTS(llui "${llui_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llui "${llui_TEST_SOURCE_FILES}")
# INTEGRATION TESTS # INTEGRATION TESTS
set(test_libs llui llmessage llcorehttp llcommon
${HUNSPELL_LIBRARY}
${LLCOMMON_LIBRARIES}
${BOOST_FIBER_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_SYSTEM_LIBRARY}
${WINDOWS_LIBRARIES})
if(NOT LINUX) if(NOT LINUX)
set(test_libs llui llmessage llcorehttp llxml llrender llcommon hunspell::hunspell ${WINDOWS_LIBRARIES})
LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}")
endif(NOT LINUX) endif(NOT LINUX)
endif(LL_TESTS) endif(LL_TESTS)

38
indra/llwindow/CMakeLists.txt
View File

@ -14,26 +14,9 @@ include(00-Common)
include(DragDrop) include(DragDrop)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLMath)
include(LLRender)
include(LLFileSystem)
include(LLWindow) include(LLWindow)
include(LLXML)
include(UI) include(UI)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llwindow_SOURCE_FILES set(llwindow_SOURCE_FILES
llcursortypes.cpp llcursortypes.cpp
@ -64,17 +47,18 @@ set(viewer_HEADER_FILES
llmousehandler.h llmousehandler.h
) )
set(llwindow_LINK_LIBRARIES
llcommon
llimage
llmath
llrender
llfilesystem
llxml
)
# Libraries on which this library depends, needed for Linux builds # Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level # Sort by high-level to low-level
if (LINUX) if (LINUX)
set(llwindow_LINK_LIBRARIES set(llwindow_LINK_LIBRARIES APPEND
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLRENDER_LIBRARIES}
${LLFILESYSTEM_LIBRARIES}
${LLWINDOW_LIBRARIES}
${LLXML_LIBRARIES}
${UI_LIBRARIES} # for GTK ${UI_LIBRARIES} # for GTK
${SDL_LIBRARY} ${SDL_LIBRARY}
fontconfig # For FCInit and other FC* functions. fontconfig # For FCInit and other FC* functions.
@ -196,5 +180,5 @@ if (SDL_FOUND)
) )
endif (SDL_FOUND) endif (SDL_FOUND)
target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
set_target_include_dirs(llwindow ${CMAKE_CURRENT_SOURCE_DIR})

32
indra/llxml/CMakeLists.txt
View File

@ -4,18 +4,6 @@ project(llxml)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLMath)
include(LLFileSystem)
include(LLXML)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
)
include_directories(
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
set(llxml_SOURCE_FILES set(llxml_SOURCE_FILES
llcontrol.cpp llcontrol.cpp
@ -42,11 +30,13 @@ add_library (llxml ${llxml_SOURCE_FILES})
# Libraries on which this library depends, needed for Linux builds # Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level # Sort by high-level to low-level
target_link_libraries( llxml target_link_libraries( llxml
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${LLCOMMON_LIBRARIES} llcommon
${EXPAT_LIBRARIES} expat::expat
) )
set_target_include_dirs( llxml ${CMAKE_CURRENT_SOURCE_DIR})
# tests # tests
@ -62,11 +52,11 @@ if (LL_TESTS)
# set(TEST_DEBUG on) # set(TEST_DEBUG on)
set(test_libs set(test_libs
${LLXML_LIBRARIES} llxml
${WINDOWS_LIBRARIES} llmath
${LLMATH_LIBRARIES} llcommon
${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}
) )
LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}")
endif (LL_TESTS) endif (LL_TESTS)

20
indra/media_plugins/base/CMakeLists.txt
View File

@ -5,25 +5,9 @@ project(media_plugin_base)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLPlugin)
include(LLMath)
include(LLRender)
include(LLWindow) include(LLWindow)
include(Linking) include(Linking)
include(PluginAPI) include(PluginAPI)
include(OpenGL)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
### media_plugin_base ### media_plugin_base
@ -48,5 +32,7 @@ set(media_plugin_base_HEADER_FILES
add_library(media_plugin_base add_library(media_plugin_base
${media_plugin_base_SOURCE_FILES} ${media_plugin_base_SOURCE_FILES}
) )
target_link_libraries( media_plugin_base llplugin )
set_target_include_dirs(media_plugin_base ${CMAKE_CURRENT_SOURCE_DIR})

30
indra/media_plugins/cef/CMakeLists.txt
View File

@ -5,29 +5,12 @@ project(media_plugin_cef)
include(Boost) include(Boost)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLPlugin)
include(LLMath)
include(LLRender)
include(LLWindow) include(LLWindow)
include(Linking) include(Linking)
include(PluginAPI) include(PluginAPI)
include(MediaPluginBase)
include(CEFPlugin) include(CEFPlugin)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${CEF_INCLUDE_DIR}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
### media_plugin_cef ### media_plugin_cef
@ -47,13 +30,6 @@ set(media_plugin_cef_HEADER_FILES
volume_catcher.h volume_catcher.h
) )
set (media_plugin_cef_LINK_LIBRARIES
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${CEF_PLUGIN_LIBRARIES}
${LLCOMMON_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES})
# Select which VolumeCatcher implementation to use # Select which VolumeCatcher implementation to use
if (LINUX) if (LINUX)
message(FATAL_ERROR "CEF plugin has been enabled for a Linux compile.\n" message(FATAL_ERROR "CEF plugin has been enabled for a Linux compile.\n"
@ -62,7 +38,7 @@ elseif (DARWIN)
list(APPEND media_plugin_cef_SOURCE_FILES mac_volume_catcher_null.cpp) list(APPEND media_plugin_cef_SOURCE_FILES mac_volume_catcher_null.cpp)
find_library(CORESERVICES_LIBRARY CoreServices) find_library(CORESERVICES_LIBRARY CoreServices)
find_library(AUDIOUNIT_LIBRARY AudioUnit) find_library(AUDIOUNIT_LIBRARY AudioUnit)
list(APPEND media_plugin_cef_LINK_LIBRARIES set( media_plugin_cef_LINK_LIBRARIES
${CORESERVICES_LIBRARY} # for Component Manager calls ${CORESERVICES_LIBRARY} # for Component Manager calls
${AUDIOUNIT_LIBRARY} # for AudioUnit calls ${AUDIOUNIT_LIBRARY} # for AudioUnit calls
) )
@ -85,7 +61,9 @@ add_library(media_plugin_cef
#) #)
target_link_libraries(media_plugin_cef target_link_libraries(media_plugin_cef
${media_plugin_cef_LINK_LIBRARIES} media_plugin_base
cef::cef
${media_plugin_cef_LINK_LIBRARIES}
) )
if (WINDOWS) if (WINDOWS)

35
indra/media_plugins/example/CMakeLists.txt
View File

@ -5,31 +5,12 @@ project(media_plugin_example)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLPlugin)
include(LLMath)
include(LLRender)
include(LLWindow) include(LLWindow)
include(Linking) include(Linking)
include(PluginAPI) include(PluginAPI)
include(MediaPluginBase)
include(OpenGL)
include(ExamplePlugin) include(ExamplePlugin)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
### media_plugin_example ### media_plugin_example
if(NOT ADDRESS_SIZE EQUAL 32) if(NOT ADDRESS_SIZE EQUAL 32)
@ -49,21 +30,7 @@ add_library(media_plugin_example
${media_plugin_example_SOURCE_FILES} ${media_plugin_example_SOURCE_FILES}
) )
target_link_libraries(media_plugin_example target_link_libraries(media_plugin_example media_plugin_base )
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
${EXAMPLE_PLUGIN_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(media_plugin_example
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
# Using ${LLCOMMON_LIBRARIES} here drags in a whole bunch of Boost stuff
# that only produces CMake warnings about nonexistent dependencies.
llcommon
)
if (WINDOWS) if (WINDOWS)
set_target_properties( set_target_properties(

30
indra/media_plugins/gstreamer010/CMakeLists.txt
View File

@ -16,20 +16,6 @@ include(OpenGL)
include(GStreamer010Plugin) include(GStreamer010Plugin)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${GSTREAMER010_INCLUDE_DIRS}
${GSTREAMER010_PLUGINS_BASE_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
### media_plugin_gstreamer010 ### media_plugin_gstreamer010
@ -59,17 +45,5 @@ add_library(media_plugin_gstreamer010
) )
target_link_libraries(media_plugin_gstreamer010 target_link_libraries(media_plugin_gstreamer010
${LLPLUGIN_LIBRARIES} media_plugin_base
${MEDIA_PLUGIN_BASE_LIBRARIES} )
${LLCOMMON_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}
${GSTREAMER010_LIBRARIES}
)
add_dependencies(media_plugin_gstreamer010
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)

43
indra/media_plugins/libvlc/CMakeLists.txt
View File

@ -5,32 +5,12 @@ project(media_plugin_libvlc)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
include(LLPlugin)
include(LLMath)
include(LLRender)
include(LLWindow) include(LLWindow)
include(Linking) include(Linking)
include(PluginAPI) include(PluginAPI)
include(MediaPluginBase)
include(OpenGL)
include(LibVLCPlugin) include(LibVLCPlugin)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${VLC_INCLUDE_DIR}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
### media_plugin_libvlc ### media_plugin_libvlc
if(NOT ADDRESS_SIZE EQUAL 32) if(NOT ADDRESS_SIZE EQUAL 32)
@ -51,27 +31,8 @@ add_library(media_plugin_libvlc
) )
target_link_libraries(media_plugin_libvlc target_link_libraries(media_plugin_libvlc
${LLPLUGIN_LIBRARIES} media_plugin_base
${MEDIA_PLUGIN_BASE_LIBRARIES} libvlc::libvlc
${LLCOMMON_LIBRARIES}
${VLC_PLUGIN_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(media_plugin_libvlc
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
##${LLCOMMON_LIBRARIES}
# Just say 'llcommon' here. LLCOMMON_LIBRARIES is specified for use in
# target_link_libraries: it includes several Boost libraries, which are
# absolutely NOT dependencies in the sense intended here. Those Boost
# library macros, in turn, specify 'debug' and 'optimized' and a different
# library name for each, producing several wordy errors:
# Policy CMP0046 is not set: Error on non-existent dependency in
# add_dependencies.
# Really, the only dependency we should mention from LLCOMMON_LIBRARIES is
# llcommon itself.
llcommon
) )
if (WINDOWS) if (WINDOWS)

238
indra/newview/CMakeLists.txt
View File

@ -24,24 +24,13 @@ include(JsonCpp)
include(LLAppearance) include(LLAppearance)
include(LLAudio) include(LLAudio)
include(LLCA) include(LLCA)
include(LLCharacter)
include(LLCommon) include(LLCommon)
include(LLCoreHttp) include(LLCoreHttp)
include(LLImage) include(LLImage)
include(LLImageJ2COJ)
include(LLInventory)
include(LLKDU) include(LLKDU)
include(LLLogin)
include(LLMath)
include(LLMessage)
include(LLPhysicsExtensions) include(LLPhysicsExtensions)
include(LLPlugin)
include(LLPrimitive) include(LLPrimitive)
include(LLRender)
include(LLUI)
include(LLFileSystem)
include(LLWindow) include(LLWindow)
include(LLXML)
include(NDOF) include(NDOF)
include(NVAPI) include(NVAPI)
include(OPENAL) include(OPENAL)
@ -57,57 +46,17 @@ include(ViewerManager)
include(VisualLeakDetector) include(VisualLeakDetector)
include(ZLIBNG) include(ZLIBNG)
include(URIPARSER) include(URIPARSER)
include(LLPrimitive)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
if (NOT HAVOK_TPV) if (NOT HAVOK_TPV)
# When using HAVOK_TPV, the library is precompiled, so no need for this # When using HAVOK_TPV, the library is precompiled, so no need for this
add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions)
cmake_policy( SET CMP0079 NEW)
target_link_libraries(llphysicsextensionsstub llcommon llmath)
endif (NOT HAVOK_TPV) endif (NOT HAVOK_TPV)
if(FMODSTUDIO)
include_directories(${FMODSTUDIO_INCLUDE_DIR})
endif(FMODSTUDIO)
include_directories(
${DBUSGLIB_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIR}
${GLOD_INCLUDE_DIR}
${LLAUDIO_INCLUDE_DIRS}
${LLCHARACTER_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLPHYSICS_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS}
${LLKDU_INCLUDE_DIRS}
${LLINVENTORY_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLPLUGIN_INCLUDE_DIRS}
${LLPRIMITIVE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLUI_INCLUDE_DIRS}
${LLFILESYSTEM_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LLLOGIN_INCLUDE_DIRS}
${LIBS_PREBUILT_DIR}/include/collada
${LIBS_PREBUILD_DIR}/include/hunspell
${OPENAL_LIB_INCLUDE_DIRS}
${LIBS_PREBUILT_DIR}/include/collada/1.4
${LLAPPEARANCE_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
)
if (USE_BUGSPLAT)
include_directories(AFTER
${BUGSPLAT_INCLUDE_DIR}
)
endif (USE_BUGSPLAT)
set(viewer_SOURCE_FILES set(viewer_SOURCE_FILES
groupchatlistener.cpp groupchatlistener.cpp
@ -1428,7 +1377,7 @@ if (DARWIN)
if (USE_BUGSPLAT) if (USE_BUGSPLAT)
list(APPEND viewer_LIBRARIES list(APPEND viewer_LIBRARIES
${BUGSPLAT_LIBRARIES} bugsplat::bugsplat
) )
endif (USE_BUGSPLAT) endif (USE_BUGSPLAT)
@ -2023,54 +1972,41 @@ endif (WINDOWS)
# modern version. # modern version.
target_link_libraries(${VIEWER_BINARY_NAME} target_link_libraries(${VIEWER_BINARY_NAME}
${LEGACY_STDIO_LIBS} ${LEGACY_STDIO_LIBS}
${PNG_PRELOAD_ARCHIVES} llaudio
${ZLIBNG_PRELOAD_ARCHIVES} llcharacter
${URIPARSER_PRELOAD_ARCHIVES} llimage
${GOOGLE_PERFTOOLS_LIBRARIES} llinventory
${LLAUDIO_LIBRARIES} llmessage
${LLCHARACTER_LIBRARIES} llplugin
${LLIMAGE_LIBRARIES} llprimitive
${LLINVENTORY_LIBRARIES} llrender
${LLMESSAGE_LIBRARIES} llui
${LLPLUGIN_LIBRARIES} llfilesystem
${LLPRIMITIVE_LIBRARIES} llwindow
${LLRENDER_LIBRARIES} llxml
${FREETYPE_LIBRARIES} llmath
${LLUI_LIBRARIES} llcorehttp
${LLFILESYSTEM_LIBRARIES} llcommon
${LLWINDOW_LIBRARIES} ${viewer_LIBRARIES}
${LLXML_LIBRARIES} ${FMODWRAPPER_LIBRARY} # must come after LLAudio
${LLMATH_LIBRARIES} glod::glod
${LLCOREHTTP_LIBRARIES} ndof::ndof
${LLCOMMON_LIBRARIES} ${SDL_LIBRARY}
${NDOF_LIBRARY} ${SMARTHEAP_LIBRARY}
${NVAPI_LIBRARY} ${UI_LIBRARIES}
${HUNSPELL_LIBRARY} ${WINDOWS_LIBRARIES}
${viewer_LIBRARIES} lllogin
${BOOST_PROGRAM_OPTIONS_LIBRARY} llprimitive
${BOOST_REGEX_LIBRARY} llappearance
${BOOST_FIBER_LIBRARY} ${LLPHYSICS_LIBRARIES}
${BOOST_CONTEXT_LIBRARY} ${LLPHYSICSEXTENSIONS_LIBRARIES}
${DBUSGLIB_LIBRARIES} )
${OPENGL_LIBRARIES}
${FMODWRAPPER_LIBRARY} # must come after LLAudio if( TARGET nvapi::nvapi )
${GLOD_LIBRARIES} target_link_libraries(${VIEWER_BINARY_NAME} nvapi::nvapi )
${OPENGL_LIBRARIES} endif()
${JSONCPP_LIBRARIES}
${SDL_LIBRARY}
${SMARTHEAP_LIBRARY}
${UI_LIBRARIES}
${WINDOWS_LIBRARIES}
${EXPAT_LIBRARIES}
${XMLRPCEPI_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${LLLOGIN_LIBRARIES}
${LLPHYSICS_LIBRARIES}
${LLPHYSICSEXTENSIONS_LIBRARIES}
${LLAPPEARANCE_LIBRARIES}
)
if (USE_BUGSPLAT) if (USE_BUGSPLAT)
target_link_libraries(${VIEWER_BINARY_NAME} target_link_libraries(${VIEWER_BINARY_NAME}
@ -2386,10 +2322,15 @@ if (LL_TESTS)
) )
set(test_libs set(test_libs
${LLCOMMON_LIBRARIES} llcommon
${JSONCPP_LIBRARIES} llfilesystem
${CURL_LIBRARIES} llxml
${NGHTTP2_LIBRARIES} llmessage
llcharacter
llui
lllogin
llplugin
llappearance
) )
set_source_files_properties( set_source_files_properties(
@ -2398,17 +2339,6 @@ if (LL_TESTS)
LL_TEST_ADDITIONAL_LIBRARIES "${test_libs}" LL_TEST_ADDITIONAL_LIBRARIES "${test_libs}"
) )
set_source_files_properties(
llviewerhelputil.cpp
PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
)
set_source_files_properties(
llremoteparcelrequest.cpp
PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
)
set_source_files_properties( set_source_files_properties(
llworldmap.cpp llworldmap.cpp
@ -2416,27 +2346,23 @@ if (LL_TESTS)
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_SOURCE_FILES LL_TEST_ADDITIONAL_SOURCE_FILES
tests/llviewertexture_stub.cpp tests/llviewertexture_stub.cpp
#llviewertexturelist.cpp
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
) )
set_source_files_properties( set_source_files_properties(
llmediadataclient.cpp llmediadataclient.cpp
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${LLPRIMITIVE_LIBRARIES}" LL_TEST_ADDITIONAL_LIBRARIES llprimitive
)
set_source_files_properties(
llagentaccess.cpp
PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
) )
set_source_files_properties( set_source_files_properties(
lllogininstance.cpp lllogininstance.cpp
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_SOURCE_FILES llversioninfo.cpp LL_TEST_ADDITIONAL_SOURCE_FILES llversioninfo.cpp
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}" )
set_property( SOURCE
${viewer_TEST_SOURCE_FILES}
PROPERTY
LL_TEST_ADDITIONAL_LIBRARIES ${test_libs}
) )
################################################## ##################################################
@ -2458,41 +2384,29 @@ if (LL_TESTS)
# if(USE_PRECOMPILED_HEADERS) # if(USE_PRECOMPILED_HEADERS)
# set(test_sources "${test_sources}" llviewerprecompiledheaders.cpp) # set(test_sources "${test_sources}" llviewerprecompiledheaders.cpp)
# endif(USE_PRECOMPILED_HEADERS) # endif(USE_PRECOMPILED_HEADERS)
set(test_libs
${LLMESSAGE_LIBRARIES}
${WINDOWS_LIBRARIES}
${LLFILESYSTEM_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
${GOOGLEMOCK_LIBRARIES}
)
if (LINUX)
# llcommon uses `clock_gettime' which is provided by librt on linux.
set(LIBRT_LIBRARY
rt
)
endif (LINUX)
set(test_libs set(test_libs
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLMATH_LIBRARIES} llmath
${LLCOMMON_LIBRARIES} llcommon
${LLMESSAGE_LIBRARIES} llmessage
${LLCOREHTTP_LIBRARIES} llcorehttp
${GOOGLEMOCK_LIBRARIES} llxml
${OPENSSL_LIBRARIES} llui
${CRYPTO_LIBRARIES} llplugin
${LIBRT_LIBRARY} llappearance
${BOOST_FIBER_LIBRARY} lllogin
${BOOST_CONTEXT_LIBRARY} llprimitive
) lllogin
)
LL_ADD_INTEGRATION_TEST(cppfeatures LL_ADD_INTEGRATION_TEST(cppfeatures
"" ""
"${test_libs}" "${test_libs}"
) )
LL_ADD_INTEGRATION_TEST(llsechandler_basic LL_ADD_INTEGRATION_TEST(llsechandler_basic
llsechandler_basic.cpp llsechandler_basic.cpp
"${test_libs}" "${test_libs}"
@ -2508,7 +2422,6 @@ if (LL_TESTS)
llviewernetwork.cpp llviewernetwork.cpp
) )
LL_ADD_INTEGRATION_TEST(llslurl LL_ADD_INTEGRATION_TEST(llslurl
"${llslurl_test_sources}" "${llslurl_test_sources}"
"${test_libs}" "${test_libs}"
@ -2531,15 +2444,6 @@ if (LL_TESTS)
#ADD_VIEWER_BUILD_TEST(lltextureinfo viewer) #ADD_VIEWER_BUILD_TEST(lltextureinfo viewer)
#ADD_VIEWER_BUILD_TEST(lltextureinfodetails viewer) #ADD_VIEWER_BUILD_TEST(lltextureinfodetails viewer)
include(LLAddBuildTest)
SET(viewer_TEST_SOURCE_FILES
llagentaccess.cpp
)
set_source_files_properties(
${viewer_TEST_SOURCE_FILES}
PROPERTIES
LL_TEST_ADDITIONAL_SOURCE_FILES llviewerprecompiledheaders.cpp
)
endif (LL_TESTS) endif (LL_TESTS)

38
indra/test/CMakeLists.txt
View File

@ -5,11 +5,6 @@ project (lltest)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLCoreHttp) include(LLCoreHttp)
include(LLInventory)
include(LLMath)
include(LLMessage)
include(LLFileSystem)
include(LLXML)
include(Linking) include(Linking)
include(Tut) include(Tut)
include(LLAddBuildTest) include(LLAddBuildTest)
@ -88,27 +83,18 @@ if (USE_BUGSPLAT)
endif (USE_BUGSPLAT) endif (USE_BUGSPLAT)
target_link_libraries(lltest target_link_libraries(lltest
${LEGACY_STDIO_LIBS} ${LEGACY_STDIO_LIBS}
${LLDATABASE_LIBRARIES} ${LLDATABASE_LIBRARIES}
${LLINVENTORY_LIBRARIES} llinventory
${LLMESSAGE_LIBRARIES} llmessage
${LLMATH_LIBRARIES} llmath
${LLFILESYSTEM_LIBRARIES} llfilesystem
${LLXML_LIBRARIES} llxml
${LSCRIPT_LIBRARIES} llcommon
${LLCOMMON_LIBRARIES} llcorehttp
${LLCOREHTTP_LIBRARIES} ${WINDOWS_LIBRARIES}
${EXPAT_LIBRARIES} ${DL_LIBRARY}
${GOOGLEMOCK_LIBRARIES} )
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
${DL_LIBRARY}
)
if (WINDOWS) if (WINDOWS)
set_target_properties(lltest set_target_properties(lltest

31
indra/viewer_components/login/CMakeLists.txt
View File

@ -7,21 +7,7 @@ if(LL_TESTS)
include(LLAddBuildTest) include(LLAddBuildTest)
endif(LL_TESTS) endif(LL_TESTS)
include(LLCommon) include(LLCommon)
include(LLMath)
include(LLXML)
include(Boost)
include(LLCoreHttp) include(LLCoreHttp)
include(LLMessage)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(login_SOURCE_FILES set(login_SOURCE_FILES
lllogin.cpp lllogin.cpp
@ -42,17 +28,14 @@ list(APPEND
add_library(lllogin add_library(lllogin
${login_SOURCE_FILES} ${login_SOURCE_FILES}
) )
set_target_include_dirs( lllogin ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(lllogin target_link_libraries(lllogin
${LLMESSAGE_LIBRARIES} llmessage
${LLCOREHTTP_LIBRARIES} llcorehttp
${LLCOMMON_LIBRARIES} llcommon
${LLMATH_LIBRARIES} llmath
${LLXML_LIBRARIES} llxml
${BOOST_THREAD_LIBRARY}
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
) )
if(LL_TESTS) if(LL_TESTS)
@ -62,7 +45,7 @@ if(LL_TESTS)
set_source_files_properties( set_source_files_properties(
lllogin.cpp lllogin.cpp
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${LLMESSAGE_LIBRARIES};${LLCOREHTTP_LIBRARIES};${LLCOMMON_LIBRARIES};${BOOST_FIBER_LIBRARY};${BOOST_CONTEXT_LIBRARY};${BOOST_THREAD_LIBRARY};${BOOST_SYSTEM_LIBRARY}" LL_TEST_ADDITIONAL_LIBRARIES llmessage llcorehttp llcommon
) )
LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")