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.

indra/cmake/00-Common.cmake

@@ -70,12 +70,6 @@ if (WINDOWS)
   if( ADDRESS_SIZE EQUAL 32 )
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")  
   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
   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
       )
   add_compile_options(
-      /GS
-      /TP
-      /W3
-      /c
-      /Zc:forScope
-      /nologo
-      /Oy-
-#      /arch:SSE2
-      /fp:fast
+
+          /Zo
+          /GS
+          /TP
+          /W3
+          /c
+          /Zc:forScope
+          /nologo
+          /Oy-
+          /fp:fast
       )
 
   # Nicky: x64 implies SSE2

indra/cmake/APR.cmake

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

indra/cmake/Atmosphere.cmake

-# -*- cmake -*-
-include(Prebuilt)
-use_prebuilt_binary(libatmosphere)
-set(LIBATMOSPHERE_LIBRARIES atmosphere)
-set(LIBATMOSPHERE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/atmosphere)

indra/cmake/Audio.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
+if(TARGET vorbis::vorbis)
+  return()
+endif()
+create_target(vorbis::vorbis)
+
 if (USESYSTEMLIBS)
   include(FindPkgConfig)
   pkg_check_modules(OGG REQUIRED ogg)
@@ -9,34 +14,12 @@ if (USESYSTEMLIBS)
   pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(ogg_vorbis)
-  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-  set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
-  set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
+  set_target_include_dirs( vorbis::vorbis ${LIBS_PREBUILT_DIR}/include )
 
   if (WINDOWS)
-    set(OGG_LIBRARIES
-        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)
+    set_target_libraries(vorbis::vorbis ogg_static vorbis_static vorbisenc_static vorbisfile_static )
   else (WINDOWS)
-    set(OGG_LIBRARIES ogg)
-    set(VORBIS_LIBRARIES vorbis)
-    set(VORBISENC_LIBRARIES vorbisenc)
-    set(VORBISFILE_LIBRARIES vorbisfile)
+    set_target_libraries(vorbis::vorbis ogg vorbis vorbisenc vorbisfile )
   endif (WINDOWS)
 endif (USESYSTEMLIBS)
 
-link_directories(
-    ${VORBIS_LIBRARY_DIRS}
-    ${VORBISENC_LIBRARY_DIRS}
-    ${VORBISFILE_LIBRARY_DIRS}
-    ${OGG_LIBRARY_DIRS}
-    )

indra/cmake/Boost.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
+if( TARGET boost::boost )
+  return()
+endif()
+create_target( boost::boost )
+
 set(Boost_FIND_QUIETLY ON)
 set(Boost_FIND_REQUIRED ON)
 
@@ -24,80 +29,34 @@ else (USESYSTEMLIBS)
   set(addrsfx "-x${ADDRESS_SIZE}")
 
   if (WINDOWS)
-    set(BOOST_CONTEXT_LIBRARY
-        optimized libboost_context-mt${addrsfx}
-        debug libboost_context-mt${addrsfx}-gd)
-    set(BOOST_FIBER_LIBRARY
-        optimized libboost_fiber-mt${addrsfx}
-        debug libboost_fiber-mt${addrsfx}-gd)
-    set(BOOST_FILESYSTEM_LIBRARY
-        optimized libboost_filesystem-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)
+      set_target_libraries( boost::boost
+              libboost_context-mt${addrsfx}
+              libboost_fiber-mt${addrsfx}
+              libboost_filesystem-mt${addrsfx}
+              libboost_program_options-mt${addrsfx}
+              libboost_regex-mt${addrsfx}
+              libboost_system-mt${addrsfx}
+              libboost_thread-mt${addrsfx})
   elseif (LINUX)
-    set(BOOST_CONTEXT_LIBRARY
-        optimized boost_context-mt${addrsfx}
-        debug boost_context-mt${addrsfx}-d)
-    set(BOOST_FIBER_LIBRARY
-        optimized boost_fiber-mt${addrsfx}
-        debug boost_fiber-mt${addrsfx}-d)
-    set(BOOST_FILESYSTEM_LIBRARY
-        optimized boost_filesystem-mt${addrsfx}
-        debug boost_filesystem-mt${addrsfx}-d)
-    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)
+    set_target_libraries( boost::boost
+            boost_context-mt${addrsfx}
+            boost_fiber-mt${addrsfx}
+            boost_filesystem-mt${addrsfx}
+            boost_program_options-mt${addrsfx}
+            boost_regex-mt${addrsfx}
+            boost_signals-mt${addrsfx}
+            boost_system-mt${addrsfx}
+            boost_thread-mt${addrsfx})
   elseif (DARWIN)
-    set(BOOST_CONTEXT_LIBRARY
-        optimized boost_context-mt${addrsfx}
-        debug boost_context-mt${addrsfx}-d)
-    set(BOOST_FIBER_LIBRARY
-        optimized boost_fiber-mt${addrsfx}
-        debug boost_fiber-mt${addrsfx}-d)
-    set(BOOST_FILESYSTEM_LIBRARY
-        optimized boost_filesystem-mt${addrsfx}
-        debug boost_filesystem-mt${addrsfx}-d)
-    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)
+    set_target_libraries( boost::boost
+            boost_context-mt${addrsfx}
+            boost_fiber-mt${addrsfx}
+            boost_filesystem-mt${addrsfx}
+            boost_program_options-mt${addrsfx}
+            boost_regex-mt${addrsfx}
+            boost_signals-mt${addrsfx}
+            boost_system-mt${addrsfx}
+            boost_thread-mt${addrsfx})
   endif (WINDOWS)
 endif (USESYSTEMLIBS)
 

indra/cmake/CEFPlugin.cmake

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

indra/cmake/CMakeLists.txt

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

indra/cmake/CURL.cmake

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

indra/cmake/EXPAT.cmake

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

indra/cmake/FMODSTUDIO.cmake

@@ -8,9 +8,17 @@ if (INSTALL_PROPRIETARY)
 endif (INSTALL_PROPRIETARY)
 
 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 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)
     # 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)
@@ -18,21 +26,15 @@ if (FMODSTUDIO)
     include(Prebuilt)
     use_prebuilt_binary(fmodstudio)
     if (WINDOWS)
-      set(FMODSTUDIO_LIBRARY
-          debug fmodL_vc
-          optimized fmod_vc)
+      set_target_libraries( fmodstudio::fmodstudio  fmod_vc)
     elseif (DARWIN)
       #despite files being called libfmod.dylib, we are searching for fmod
-      set(FMODSTUDIO_LIBRARY
-          debug fmodL
-          optimized fmod)
+      set_target_libraries( fmodstudio::fmodstudio  fmod)
     elseif (LINUX)
-      set(FMODSTUDIO_LIBRARY
-          debug fmodL
-          optimized fmod)
+      set_target_libraries( fmodstudio::fmodstudio  fmod)
     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)
 

indra/cmake/FreeType.cmake

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

indra/cmake/GLOD.cmake

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

indra/cmake/Hunspell.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-set(HUNSPELL_FIND_QUIETLY ON)
-set(HUNSPELL_FIND_REQUIRED ON)
+if( TARGET hunspell::hunspell )
+  return()
+endif()
+create_target( hunspell::hunspell )
 
 if (USESYSTEMLIBS)
   include(FindHUNSPELL)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(libhunspell)
   if (WINDOWS)
-    set(HUNSPELL_LIBRARY libhunspell)
+    set_target_libraries( hunspell::hunspell libhunspell)
   elseif(DARWIN)
-    set(HUNSPELL_LIBRARY hunspell-1.3)
+    set_target_libraries( hunspell::hunspell hunspell-1.3)
   elseif(LINUX)
-    set(HUNSPELL_LIBRARY hunspell-1.3)
+    set_target_libraries( hunspell::hunspell hunspell-1.3)
   else()
     message(FATAL_ERROR "Invalid platform")
   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)
 endif (USESYSTEMLIBS)

indra/cmake/JPEG.cmake

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

indra/cmake/JsonCpp.cmake

 # -*- cmake -*-
 
 include(Prebuilt)
-
-set(JSONCPP_FIND_QUIETLY ON)
-set(JSONCPP_FIND_REQUIRED ON)
+if( TARGET jsoncpp::jsoncpp )
+  return()
+endif()
+create_target( jsoncpp::jsoncpp)
 
 if (USESYSTEMLIBS)
   include(FindJsonCpp)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
-    set(JSONCPP_LIBRARIES 
-      debug json_libmdd.lib
-      optimized json_libmd.lib)
+    set_target_libraries( jsoncpp::jsoncpp json_libmd.lib )
   elseif (DARWIN)
-    set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
+    set_target_libraries( jsoncpp::jsoncpp libjson_darwin_libmt.a )
   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)
-  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)

indra/cmake/LLAddBuildTest.cmake

@@ -36,30 +36,29 @@ INCLUDE(GoogleMock)
     )
   SET(alltest_DEP_TARGETS
     # needed by the test harness itself
-    ${APRUTIL_LIBRARIES}
-    ${APR_LIBRARIES}
     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")
     # add llmath as a dep unless the tested module *is* llmath!
     LIST(APPEND alltest_DEP_TARGETS
-      llmath
-      )
+            llmath
+            )
+    LIST(APPEND alltest_LIBRARIES
+            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.
   SET(alltest_HEADER_FILES
     ${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}")
     ENDIF(LL_TEST_VERBOSE)
     # 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
     GET_OPT_SOURCE_FILE_PROPERTY(${name}_test_additional_CFLAGS ${source} LL_TEST_ADDITIONAL_CFLAGS)
     SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name}

indra/cmake/LLAppearance.cmake

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

indra/cmake/LLAudio.cmake

 # -*- cmake -*-
 
 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})

indra/cmake/LLCharacter.cmake

-# -*- cmake -*-
-
-set(LLCHARACTER_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llcharacter
-    )
-
-set(LLCHARACTER_LIBRARIES llcharacter)

indra/cmake/LLCommon.cmake

@@ -4,36 +4,5 @@ include(APR)
 include(Boost)
 include(EXPAT)
 include(ZLIBNG)
-
-set(LLCOMMON_INCLUDE_DIRS
-    ${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)
+include(JsonCpp)
+include(XmlRpcEpi)
\ No newline at end of file