merge with El Capitan and packaging fixes

1 files changed, 0 insertions, 43 deletions

diff --git a/indra/lscript/lscript_execute/CMakeLists.txt b/indra/lscript/lscript_execute/CMakeLists.txt
deleted file mode 100755
index 49605982a8..0000000000
--- a/indra/lscript/lscript_execute/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- cmake -*-
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LScript)
-
-include_directories(
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLMATH_INCLUDE_DIRS}
-    ${LSCRIPT_INCLUDE_DIRS}
-    )
-include_directories(SYSTEM
-    ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
-    )
-
-set(lscript_execute_SOURCE_FILES
-    llscriptresource.cpp
-    llscriptresourceconsumer.cpp
-    llscriptresourcepool.cpp
-    lscript_execute.cpp
-    lscript_heapruntime.cpp
-    lscript_readlso.cpp
-    )
-
-set(lscript_execute_HEADER_FILES
-    CMakeLists.txt
-
-    ../llscriptresource.h
-    ../llscriptresourceconsumer.h
-    ../llscriptresourcepool.h
-    ../lscript_execute.h
-    ../lscript_rt_interface.h
-    lscript_heapruntime.h
-    lscript_readlso.h
-    )
-
-set_source_files_properties(${lscript_execute_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
-list(APPEND lscript_execute_SOURCE_FILES ${lscript_execute_HEADER_FILES})
-
-add_library (lscript_execute ${lscript_execute_SOURCE_FILES})