Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout.

2014-12-03 22:36:42 -06:00
parent 7ddef751ef
commit 958031dbaf
44 changed files with 502 additions and 458 deletions
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -18,5 +18,8 @@ else (STANDALONE)
      list(APPEND CURL_LIBRARIES idn)
    endif(LINUX AND WORD_SIZE EQUAL 64)
  endif (WINDOWS)
-  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(CURL_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (STANDALONE)