svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

1 files changed, 31 insertions, 0 deletions

diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
new file mode 100644
index 0000000000..ed3ff3c8ee
--- /dev/null
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+project(llimagej2coj)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(OpenJPEG)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${OPENJPEG_INCLUDE_DIR}
+    )
+
+set(llimagej2coj_SOURCE_FILES
+    llimagej2coj.cpp
+    )
+
+set(llimagej2coj_HEADER_FILES
+    CMakeLists.txt
+
+    llimagej2coj.h
+    )
+
+set_source_files_properties(${llimagej2coj_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
+
+add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})