Install GLH, Mikktspace, TinyEXR, TinyGLTF & LLCA

automatically. Fix tab to spaces too.

6 files changed, 4 insertions, 14 deletions

diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake
index bdd8bc4836..648a08454b 100644
--- a/indra/cmake/GLH.cmake
+++ b/indra/cmake/GLH.cmake
@@ -2,11 +2,9 @@
 include(Prebuilt)
 
 add_library( ll::glh_linear INTERFACE IMPORTED )
+target_include_directories( ll::glh_linear SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
 
-if (USESYSTEMLIBS)
-  target_include_directories( ll::glh_linear SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
-  return ()
-endif ()
-
+if (NOT USESYSTEMLIBS)
 use_system_binary( glh_linear )
+endif (NOT USESYSTEMLIBS)
 use_prebuilt_binary(glh_linear)
diff --git a/indra/cmake/Mikktspace.cmake b/indra/cmake/Mikktspace.cmake
index 9fd2becba4..c73321e313 100644
--- a/indra/cmake/Mikktspace.cmake
+++ b/indra/cmake/Mikktspace.cmake
@@ -1,6 +1,4 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(mikktspace)
-endif (NOT USESYSTEMLIBS)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 683c30c059..9125864c1d 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -44,7 +44,7 @@ macro (use_prebuilt_binary _binary)
             execute_process(COMMAND xmllint
                 --xpath
                 "//map/map/map/map/map/map/string[contains(text(),'${_binary}')][contains(text(),'common')]/text()" autobuild.xml
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..
                 OUTPUT_VARIABLE package_url
                 OUTPUT_STRIP_TRAILING_WHITESPACE
                 )
diff --git a/indra/cmake/TinyEXR.cmake b/indra/cmake/TinyEXR.cmake
index c3053b8149..e6d142d19d 100644
--- a/indra/cmake/TinyEXR.cmake
+++ b/indra/cmake/TinyEXR.cmake
@@ -1,9 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT USESYSTEMLIBS)
 use_prebuilt_binary(tinyexr)
-endif ()
 
 set(TINYEXR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinyexr) 
 
diff --git a/indra/cmake/TinyGLTF.cmake b/indra/cmake/TinyGLTF.cmake
index 7e74089208..92b2de309f 100644
--- a/indra/cmake/TinyGLTF.cmake
+++ b/indra/cmake/TinyGLTF.cmake
@@ -1,9 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT USESYSTEMLIBS)
 use_prebuilt_binary(tinygltf)
-endif (NOT USESYSTEMLIBS)
 
 set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf)
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index feedf6b2e0..1bf44abb95 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -28,9 +28,7 @@ endif ()
 include(JsonCpp)
 include(LLAppearance)
 include(LLAudio)
-if (NOT USESYSTEMLIBS)
 include(LLCA)
-endif ()
 include(LLCommon)
 include(LLCoreHttp)
 include(LLImage)