I think I've figgered out why it's failing on Linux now. Also some possible fixes for genpoo

Author: N3X15

indra/CMakeLists.txt

@@ -49,7 +49,13 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
 add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
-add_subdirectory(${LIBS_OPEN_PREFIX}libopenjpeg)
+
+if (LIBOPENJPEG2)
+  add_subdirectory(${LIBS_OPEN_PREFIX}libopenjpeg2)
+else (LIBOPENJPEG2)
+  add_subdirectory(${LIBS_OPEN_PREFIX}libopenjpeg)
+endif (LIBOPENJPEG2)
+
 add_subdirectory(${LIBS_OPEN_PREFIX}llimagej2coj)
 add_subdirectory(${LIBS_OPEN_PREFIX}llinventory)
 add_subdirectory(${LIBS_OPEN_PREFIX}llmath)

indra/cmake/OpenJPEG.cmake

@@ -2,5 +2,8 @@
 
 # In-source library only need these variables set.
 set(OPENJPEG_LIBRARIES openjpeg)
-set(OPENJPEG_INCLUDE_DIR ${LIBS_OPEN_DIR}/libopenjpeg)
-
+if (LIBOPENJPEG2)
+  set(OPENJPEG_INCLUDE_DIR ${LIBS_OPEN_DIR}/libopenjpeg2)
+else (LIBOPENJPEG2)
+  set(OPENJPEG_INCLUDE_DIR ${LIBS_OPEN_DIR}/libopenjpeg)
+endif (LIBOPENJPEG2)

indra/newview/CMakeLists.txt

@@ -71,7 +71,7 @@ include_directories(
     ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
     ${VIEWER_RESOURCE_DIRS}
     ${GROWL_INCLUDE_DIRS}
-    )
+)
 
 set(viewer_SOURCE_FILES
     a_phoenixviewerlink.cpp
@@ -1138,11 +1138,10 @@ if (WINDOWS)
       include_directories(${ARTWORK_DIR}/res)
     endif(NOT ARTWORK_IN_SOURCE)
 
-    set(viewer_RESOURCE_FILES 
-        res/resource.h
+    configure_files(viewer_GENERATED_RESOURCE_FILES
         res/viewerRes.rc 
-        ${viewer_RESOURCE_FILES}
         )
+    list(APPEND viewer_RESOURCE_FILES ${viewer_GENERATED_RESOURCE_FILES})
 
     SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES})
 
@@ -1405,8 +1404,7 @@ if (WINDOWS)
 
     if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
-       # fuck the crash logger/updater
-      #add_dependencies(package windows-updater windows-crash-logger)
+      add_dependencies(package windows-updater windows-crash-logger)
     endif (PACKAGE)
 endif (WINDOWS)