indra/cmake/GoogleMock.cmake

@@ -2,27 +2,31 @@
 include(Prebuilt)
 include(Linking)
 
+include_guard()
+
+add_library( ll::googlemock INTERFACE IMPORTED )
+if(USE_CONAN)
+  target_link_libraries( ll::googlemock INTERFACE  CONAN_PKG::gtest )
+
+  #Not very nice, but for the moment we need this for tut.hpp
+  target_include_directories( ll::googlemock SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) 
+  return()
+endif()
+
 use_prebuilt_binary(googlemock)
 
-set(GOOGLEMOCK_INCLUDE_DIRS
-    ${LIBS_PREBUILT_DIR}/include)
+target_include_directories( ll::googlemock SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
 
 if (LINUX)
     # VWR-24366: gmock is underlinked, it needs gtest.
-    set(GOOGLEMOCK_LIBRARIES
-        gmock -Wl,--no-as-needed
-        gtest -Wl,--as-needed)
+    target_link_libraries( ll::googlemock INTERFACE gmock gtest)
 elseif(WINDOWS)
-    set(GOOGLEMOCK_LIBRARIES
-        gmock)
-    set(GOOGLEMOCK_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/include
-        ${LIBS_PREBUILT_DIR}/include/gmock
-        ${LIBS_PREBUILT_DIR}/include/gmock/boost/tr1/tr1)
+    target_link_libraries( ll::googlemock INTERFACE gmock)
+    target_include_directories( ll::googlemock SYSTEM INTERFACE
+            ${LIBS_PREBUILT_DIR}/include
+            ${LIBS_PREBUILT_DIR}/include/gmock)
 elseif(DARWIN)
-    set(GOOGLEMOCK_LIBRARIES
-        gmock
-        gtest)
+    target_link_libraries( ll::googlemock INTERFACE gmock gtest)
 endif(LINUX)
 
 

indra/cmake/Havok.cmake

 # -*- cmake -*-
 include(Prebuilt)
-if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
-set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
+include_guard()
 
 use_prebuilt_binary(havok-source)
 
@@ -124,4 +123,3 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
   endif (LINUX)
 endforeach(HAVOK_LIB)
 
-endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

indra/cmake/Hunspell.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-set(HUNSPELL_FIND_QUIETLY ON)
-set(HUNSPELL_FIND_REQUIRED ON)
+include_guard()
+use_prebuilt_binary(dictionaries)
 
-if (USESYSTEMLIBS)
-  include(FindHUNSPELL)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(libhunspell)
-  if (WINDOWS)
-    set(HUNSPELL_LIBRARY libhunspell)
-  elseif(DARWIN)
-    set(HUNSPELL_LIBRARY hunspell-1.3)
-  elseif(LINUX)
-    set(HUNSPELL_LIBRARY hunspell-1.3)
-  else()
-    message(FATAL_ERROR "Invalid platform")
-  endif()
-  set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
-  use_prebuilt_binary(dictionaries)
-endif (USESYSTEMLIBS)
+add_library( ll::hunspell INTERFACE IMPORTED )
+use_system_binary(hunspell)
+use_prebuilt_binary(libhunspell)
+if (WINDOWS)
+  target_link_libraries( ll::hunspell INTERFACE libhunspell)
+elseif(DARWIN)
+  target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
+elseif(LINUX)
+  target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
+endif()
+target_include_directories( ll::hunspell SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/hunspell)

indra/cmake/JPEG.cmake

@@ -2,19 +2,17 @@
 include(Prebuilt)
 
 include(Linking)
-set(JPEG_FIND_QUIETLY ON)
-set(JPEG_FIND_REQUIRED ON)
 
-if (USESYSTEMLIBS)
-  include(FindJPEG)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(jpeglib)
-  if (LINUX)
-    set(JPEG_LIBRARIES jpeg)
-  elseif (DARWIN)
-    set(JPEG_LIBRARIES jpeg)
-  elseif (WINDOWS)
-    set(JPEG_LIBRARIES jpeglib)
-  endif (LINUX)
-  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)
+include_guard()
+add_library( ll::libjpeg INTERFACE IMPORTED )
+
+use_system_binary(libjpeg)
+use_prebuilt_binary(jpeglib)
+if (LINUX)
+  target_link_libraries( ll::libjpeg INTERFACE jpeg)
+elseif (DARWIN)
+  target_link_libraries( ll::libjpeg INTERFACE jpeg)
+elseif (WINDOWS)
+  target_link_libraries( ll::libjpeg INTERFACE jpeglib)
+endif (LINUX)
+target_include_directories( ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)

indra/cmake/JsonCpp.cmake

 # -*- cmake -*-
 
 include(Prebuilt)
+include_guard()
+add_library( ll::jsoncpp INTERFACE IMPORTED )
 
-set(JSONCPP_FIND_QUIETLY ON)
-set(JSONCPP_FIND_REQUIRED ON)
+use_system_binary(jsoncpp)
 
-if (USESYSTEMLIBS)
-  include(FindJsonCpp)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(jsoncpp)
-  if (WINDOWS)
-    set(JSONCPP_LIBRARIES 
-      debug json_libmdd.lib
-      optimized json_libmd.lib)
-  elseif (DARWIN)
-    set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
-  elseif (LINUX)
-    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
-  endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
-endif (USESYSTEMLIBS)
+use_prebuilt_binary(jsoncpp)
+if (WINDOWS)
+  target_link_libraries( ll::jsoncpp INTERFACE json_libmd.lib )
+elseif (DARWIN)
+  target_link_libraries( ll::jsoncpp INTERFACE libjson_darwin_libmt.a )
+elseif (LINUX)
+  target_link_libraries( ll::jsoncpp INTERFACE libjson_linux-gcc-4.1.3_libmt.a )
+endif (WINDOWS)
+target_include_directories( ll::jsoncpp SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)

indra/cmake/LLAppearance.cmake

@@ -2,26 +2,9 @@
 
 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/LLAppearanceUtility.cmake

@@ -10,5 +10,3 @@ if (INSTALL_PROPRIETARY)
         set(LLAPPEARANCEUTILITY_BIN_DIR ${CMAKE_BINARY_DIR}/llappearanceutility)
     endif (LINUX)
 endif (INSTALL_PROPRIETARY)
-
-

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,39 +4,8 @@ include(APR)
 include(Boost)
 include(EXPAT)
 include(Tracy)
-include(ZLIB)
+include(xxHash)
+include(ZLIBNG)
+include(JsonCpp)
 
-set(LLCOMMON_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llcommon
-    ${APRUTIL_INCLUDE_DIR}
-    ${APR_INCLUDE_DIR}
-    ${TRACY_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(XmlRpcEpi)

indra/cmake/LLCoreHttp.cmake

@@ -2,16 +2,4 @@
 
 include(CURL)
 include(OpenSSL)
-include(Boost)
-
-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})
+include(NGHTTP2)

indra/cmake/LLCrashLogger.cmake

-# -*- cmake -*-
-
-set(LLCRASHLOGGER_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llcrashlogger
-    )
-
-set(LLCRASHLOGGER_LIBRARIES llcrashlogger)

indra/cmake/LLFileSystem.cmake

-# -*- cmake -*-
-
-set(LLFILESYSTEM_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llfilesystem
-    )
-
-set(LLFILESYSTEM_LIBRARIES llfilesystem)

indra/cmake/LLImage.cmake

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

indra/cmake/LLImageJ2COJ.cmake

-# -*- cmake -*-
-
-include(OpenJPEG)
-
-set(LLIMAGEJ2COJ_LIBRARIES llimagej2coj)

indra/cmake/LLInventory.cmake

-# -*- cmake -*-
-
-set(LLINVENTORY_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llinventory
-    )
-
-set(LLINVENTORY_LIBRARIES llinventory)

indra/cmake/LLKDU.cmake

@@ -7,15 +7,20 @@ if (INSTALL_PROPRIETARY)
   set(USE_KDU ON CACHE BOOL "Use Kakadu library.")
 endif (INSTALL_PROPRIETARY)
 
+include_guard()
+add_library( ll::kdu INTERFACE IMPORTED )
+
 if (USE_KDU)
   include(Prebuilt)
   use_prebuilt_binary(kdu)
   if (WINDOWS)
-    set(KDU_LIBRARY kdu.lib)
+    target_link_libraries( ll::kdu INTERFACE kdu.lib)
   else (WINDOWS)
-    set(KDU_LIBRARY libkdu.a)
+    target_link_libraries( ll::kdu INTERFACE libkdu.a)
   endif (WINDOWS)
-  set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu)
-  set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
-  set(LLKDU_LIBRARIES llkdu)
+
+  target_include_directories( ll::kdu SYSTEM INTERFACE
+          ${AUTOBUILD_INSTALL_DIR}/include/kdu
+          ${LIBS_OPEN_DIR}/llkdu
+          )
 endif (USE_KDU)