From 2714ecea21d2061023a9bc8738bbefcdd28dc3ed Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 17 Dec 2014 13:13:41 -0500
Subject: [PATCH] adjust cmake not to attempt loads of packages on the wrong
platforms
---
indra/cmake/GLEXT.cmake | 4 +++-
indra/cmake/NDOF.cmake | 6 +++++-
indra/cmake/QuickTimePlugin.cmake | 4 +++-
indra/cmake/UI.cmake | 5 ++++-
indra/cmake/ViewerMiscLibs.cmake | 6 ++++--
5 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index 415b13033c6..15f7e1f2d59 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -2,7 +2,9 @@
include(Prebuilt)
if (NOT USESYSTEMLIBS)
- use_prebuilt_binary(glext)
+ if (LINUX OR WINDOWS)
+ use_prebuilt_binary(glext)
+ endif (LINUX OR WINDOWS)
use_prebuilt_binary(glh-linear)
set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
endif (NOT USESYSTEMLIBS)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 8bad96f6b5c..388df16a526 100755
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -8,7 +8,11 @@ if (NDOF)
set(NDOF_FIND_REQUIRED ON)
include(FindNDOF)
else (USESYSTEMLIBS)
- use_prebuilt_binary(libndofdev)
+ if (WINDOWS OR DARWIN)
+ use_prebuilt_binary(libndofdev)
+ elseif (LINUX)
+ use_prebuilt_binary(open-libndofdev)
+ endif (WINDOWS OR DARWIN)
if (WINDOWS)
set(NDOF_LIBRARY libndofdev)
diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake
index 012f4e20d8d..c08e153ee39 100755
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -2,7 +2,9 @@
if(INSTALL_PROPRIETARY)
include(Prebuilt)
- use_prebuilt_binary(quicktime)
+ if (WINDOWS)
+ use_prebuilt_binary(quicktime)
+ endif (WINDOWS)
endif(INSTALL_PROPRIETARY)
if (DARWIN)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 58acdc22bd3..31174209a31 100755
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -32,7 +32,10 @@ if (USESYSTEMLIBS)
add_definitions(${${pkg}_CFLAGS_OTHERS})
endforeach(pkg)
else (USESYSTEMLIBS)
- use_prebuilt_binary(gtk-atk-pango-glib)
+ if (LINUX OR WINDOWS)
+ use_prebuilt_binary(gtk-atk-pango-glib)
+ endif (LINUX OR WINDOWS)
+
if (LINUX)
set(UI_LIBRARIES
atk-1.0
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index d4be24799f4..fc5bdedb5af 100755
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,9 +2,11 @@
include(Prebuilt)
if (NOT USESYSTEMLIBS)
+ if (LINUX)
+ use_prebuilt_binary(libuuid)
+ use_prebuilt_binary(fontconfig)
+ endif (LINUX)
use_prebuilt_binary(libhunspell)
- use_prebuilt_binary(libuuid)
use_prebuilt_binary(slvoice)
- use_prebuilt_binary(fontconfig)
endif(NOT USESYSTEMLIBS)
--
GitLab