viewer-cef build fixes

4 files changed, 121 insertions, 53 deletions

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 455e7980e2..6504002dd9 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -11,8 +11,12 @@
 ##   We're not there yet, but once done, there is a kludge in Linking.cmake
 #    "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed
 cmake_minimum_required(VERSION 3.16.0...4.0 FATAL_ERROR)
-cmake_policy(SET CMP0156 NEW)
-cmake_policy(SET CMP0179 NEW)
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.29.0")
+    cmake_policy(SET CMP0156 NEW)
+endif()
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.31.0")
+    cmake_policy(SET CMP0179 NEW)
+endif()
 
 set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
     "The root project/makefile/solution name. Defaults to SecondLife.")
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 7b3882c936..b57c33c3e0 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -16,53 +16,107 @@ use_prebuilt_binary(boost)
 # with the address size.
 set(addrsfx "-x${ADDRESS_SIZE}")
 
-find_library(BOOST_CONTEXT_LIBRARY
-    NAMES
-    boost_context-mt
-    boost_context-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_FIBER_LIBRARY
-    NAMES
-    boost_fiber-mt
-    boost_fiber-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_FILESYSTEM_LIBRARY
-    NAMES
-    boost_filesystem-mt
-    boost_filesystem-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_PROGRAMOPTIONS_LIBRARY
-    NAMES
-    boost_program_options-mt
-    boost_program_options-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_REGEX_LIBRARY
-    NAMES
-    boost_regex-mt
-    boost_regex-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_SYSTEM_LIBRARY
-    NAMES
-    boost_system-mt
-    boost_system-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_THREAD_LIBRARY
-    NAMES
-    boost_thread-mt
-    boost_thread-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_URL_LIBRARY
-    NAMES
-    boost_url-mt
-    boost_url-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+if (WINDOWS)
+
+    find_library(BOOST_CONTEXT_LIBRARY
+        NAMES
+        libboost_context-mt
+        libboost_context-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FIBER_LIBRARY
+        NAMES
+        libboost_fiber-mt
+        libboost_fiber-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FILESYSTEM_LIBRARY
+        NAMES
+        libboost_filesystem-mt
+        libboost_filesystem-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_PROGRAMOPTIONS_LIBRARY
+        NAMES
+        libboost_program_options-mt
+        libboost_program_options-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_REGEX_LIBRARY
+        NAMES
+        libboost_regex-mt
+        libboost_regex-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_SYSTEM_LIBRARY
+        NAMES
+        libboost_system-mt
+        libboost_system-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_THREAD_LIBRARY
+        NAMES
+        libboost_thread-mt
+        libboost_thread-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_URL_LIBRARY
+        NAMES
+        libboost_url-mt
+        libboost_url-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+else (WINDOWS)
+
+    find_library(BOOST_CONTEXT_LIBRARY
+       NAMES
+       boost_context-mt
+       boost_context-mt${addrsfx}
+       PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FIBER_LIBRARY
+        NAMES
+        boost_fiber-mt
+        boost_fiber-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_FILESYSTEM_LIBRARY
+        NAMES
+        boost_filesystem-mt
+        boost_filesystem-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_PROGRAMOPTIONS_LIBRARY
+        NAMES
+        boost_program_options-mt
+        boost_program_options-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_REGEX_LIBRARY
+        NAMES
+        boost_regex-mt
+        boost_regex-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_SYSTEM_LIBRARY
+        NAMES
+        boost_system-mt
+        boost_system-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_THREAD_LIBRARY
+        NAMES
+        boost_thread-mt
+        boost_thread-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(BOOST_URL_LIBRARY
+        NAMES
+        boost_url-mt
+        boost_url-mt${addrsfx}
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+endif (WINDOWS)
 
 target_link_libraries(ll::boost INTERFACE
     ${BOOST_FIBER_LIBRARY}
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index dc98335a28..7680ab7b54 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -14,10 +14,19 @@ if (USE_KDU)
   include(Prebuilt)
   use_prebuilt_binary(kdu)
 
-  find_library(KDU_LIBRARY
-    NAMES
-    kdu
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+  if (WINDOWS)
+    find_library(KDU_LIBRARY
+      NAMES
+      kdu
+      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+  else (WINDOWS)
+    find_library(KDU_LIBRARY
+      NAMES
+      libkdu.a
+      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+  endif (WINDOWS)
 
   target_link_libraries(ll::kdu INTERFACE ${KDU_LIBRARY})
 
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp
index 36b79047b6..bc52a15c4a 100644
--- a/indra/llkdu/tests/llimagej2ckdu_test.cpp
+++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp
@@ -80,6 +80,7 @@ U8* LLImageBase::getData() { return NULL; }
 U8* LLImageBase::reallocateData(S32 ) { return NULL; }
 void LLImageBase::sanityCheck() { }
 void LLImageBase::setSize(S32 , S32 , S32 ) { }
+bool LLImageBase::isBufferInvalid() const { return false; }
 
 LLImageJ2CImpl::~LLImageJ2CImpl() { }