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

4 files changed, 54 insertions, 5 deletions

diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
new file mode 100644
index 0000000000..5593b4a0cb
--- /dev/null
+++ b/indra/llimage/CMakeLists.txt
@@ -0,0 +1,50 @@
+# -*- cmake -*-
+
+project(llimage)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLVFS)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${PNG_INCLUDE_DIRS}
+    )
+
+set(llimage_SOURCE_FILES
+    llimagebmp.cpp
+    llimage.cpp
+    llimagedxt.cpp
+    llimagej2c.cpp
+    llimagejpeg.cpp
+    llimagepng.cpp
+    llimagetga.cpp
+    llimageworker.cpp
+    llpngwrapper.cpp
+    )
+
+set(llimage_HEADER_FILES
+    CMakeLists.txt
+
+    llimage.h
+    llimagebmp.h
+    llimagedxt.h
+    llimagej2c.h
+    llimagejpeg.h
+    llimagepng.h
+    llimagetga.h
+    llimageworker.h
+    llmapimagetype.h
+    llpngwrapper.h
+    )
+
+set_source_files_properties(${llimage_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
+
+add_library (llimage ${llimage_SOURCE_FILES})
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 450d6ff93a..3a6fd2db18 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -29,8 +29,8 @@
  */
 #include "linden_common.h"
 
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_dso.h>
+#include "apr_pools.h"
+#include "apr_dso.h"
 
 #include "lldir.h"
 #include "llimagej2c.h"
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 1ec92460bd..aebe87d626 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -40,8 +40,7 @@ LLImageJPEG::LLImageJPEG()
 	LLImageFormatted(IMG_CODEC_JPEG),
 	mOutputBuffer( NULL ),
 	mOutputBufferSize( 0 ),
-	mEncodeQuality( 75 ), // on a scale from 1 to 100
-	mSetjmpBuffer()
+	mEncodeQuality( 75 ) // on a scale from 1 to 100
 {
 }
 
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h
index 7ba1520a31..054ddad9bc 100644
--- a/indra/llimage/llimagejpeg.h
+++ b/indra/llimage/llimagejpeg.h
@@ -32,7 +32,7 @@
 #ifndef LL_LLIMAGEJPEG_H
 #define LL_LLIMAGEJPEG_H
 
-#include <setjmp.h>
+#include <csetjmp>
 
 #include "llimage.h"