summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-05-21 13:03:43 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-05-21 13:03:43 -0400
commit4562773abcfe14425478889e2fea02da205013e1 (patch)
tree9b87038611e29ebf3f1300371f1a3c5eb1b87c18 /indra/newview
parentc5f618d096f05bdff91a5d384c46e26840f5a771 (diff)
SL-821: Reorder CMakeLists.txt includes to resolve interdependencies.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2592b532c4..d28791485c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -3,6 +3,10 @@
project(viewer)
include(00-Common)
+# DON'T move Linking.cmake to its place in the alphabetized list below: it
+# sets variables on which the 3p .cmake files depend.
+include(Linking)
+
include(Boost)
include(bugsplat)
include(BuildPackagesInfo)
@@ -38,7 +42,6 @@ include(LLUI)
include(LLVFS)
include(LLWindow)
include(LLXML)
-include(Linking)
include(NDOF)
include(NVAPI)
include(OPENAL)