diff options
author | Oz Linden <oz@lindenlab.com> | 2016-02-07 13:41:41 -0800 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-02-07 13:41:41 -0800 |
commit | 867ef882fdf43dffd678722a8fdd77b618d13acf (patch) | |
tree | d234b0f6e549539638e098c3bd84a469070116f8 /indra/cmake | |
parent | f3b1efae5d27d5597d3dc9468bce93679cae85e8 (diff) | |
parent | cc235cdcc41fb1846b878769f5d4097ff9ad3b4d (diff) |
merge changes for OPEN-292
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/CMakeLists.txt | 1 | ||||
-rw-r--r-- | indra/cmake/LScript.cmake | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 4dd69649d0..88e64ffc97 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -81,7 +81,6 @@ set(cmake_SOURCE_FILES LLVFS.cmake LLWindow.cmake LLXML.cmake - LScript.cmake Linking.cmake MediaPluginBase.cmake NDOF.cmake diff --git a/indra/cmake/LScript.cmake b/indra/cmake/LScript.cmake deleted file mode 100644 index 21e78fc2c0..0000000000 --- a/indra/cmake/LScript.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# -*- cmake -*- - -set(LSCRIPT_INCLUDE_DIRS - ${LIBS_OPEN_DIR}/lscript - ${LIBS_OPEN_DIR}/lscript/lscript_compile - ${LIBS_OPEN_DIR}/lscript/lscript_execute - ${LIBS_OPEN_DIR}/lscript/lscript_execute_mono - ) - -set(LSCRIPT_LIBRARIES - lscript_compile - lscript_execute - lscript_library - ) - -set(LSCRIPT_EXECUTE_MONO_LIBRARIES lscript_execute_mono) |