Merge pull request #125 from sintefmath/jnygaard_jpgProxy

Jnygaard jpg proxy

CMakeLists.txt

@@ -130,6 +130,7 @@ FIND_PACKAGE( GLM REQUIRED )
 
 SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES})
 IF(Tinia_SERVER)
+
     IF( Tinia_IPC_VALGRIND_ANNOTATIONS )
         FIND_PATH(
             VALGRIND_INCLUDE_DIR valgrind.h
@@ -138,36 +139,51 @@ IF(Tinia_SERVER)
         ADD_DEFINITIONS( -DTINIA_IPC_VALGRIND_ANNOTATIONS )
     ENDIF( Tinia_IPC_VALGRIND_ANNOTATIONS )
 
-  FIND_PATH( APACHE_INCLUDE_DIR httpd.h
-    HINTS "/usr/include/apache2" "/usr/include/httpd/"
-  )
+    FIND_PATH( APACHE_INCLUDE_DIR httpd.h
+        HINTS "/usr/include/apache2" "/usr/include/httpd/"
+    )
+
+    FIND_LIBRARY( RT
+        NAMES rt
+        PATHS "/usr/lib/x86_64-linux-gnu/" "/usr/lib/"
+    )
 
-  FIND_LIBRARY( RT
-    NAMES rt
-    PATHS "/usr/lib/x86_64-linux-gnu/" "/usr/lib/"
+    FIND_LIBRARY(LIB_APR
+        NAMES apr-1
+        PATHS "/usr/lib/"
     )
 
-  FIND_LIBRARY(LIB_APR
-    NAMES apr-1
-    PATHS "/usr/lib/"
+    FIND_LIBRARY(LIB_TURBOJPEG
+        NAMES turbojpeg
+        HINTS "/usr/lib/" "/opt/libjpeg-turbo/lib64/"
+    )
+    FIND_PATH(TURBOJPEG_INCLUDE_DIR "turbojpeg.h"
+        HINTS "/usr/include/" "/usr/local/include/"
+              "/opt/" "/opt/libjpeg-turbo/" "/opt/libjpeg-turbo/include/"
     )
-  FIND_PACKAGE( Threads )
-
-  FIND_PATH(APR_INCLUDE_DIR "apr.h"
-HINTS   "/usr/include/apr-1.0"
-        "/usr/include/apr-1"
-        "apr-1/"
-        "apr-1.0")
-    SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} ${RT} ${CMAKE_THREAD_LIBS_INIT} ${LIB_APR})
+
+    FIND_PACKAGE( Threads )
+
+    FIND_PATH(APR_INCLUDE_DIR "apr.h"
+        HINTS   "/usr/include/apr-1.0"
+                "/usr/include/apr-1"
+                "apr-1/"
+                "apr-1.0"
+    )
+
+    SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} ${RT} ${CMAKE_THREAD_LIBS_INIT} ${LIB_APR} ${LIB_TURBOJPEG})
+
 ENDIF()
 
+
 SET(TINIA_EXTERNAL_INCLUDE_DIRS
   ${LIBXML2_INCLUDE_DIR}
   ${GLEW_INCLUDE_DIR}
   ${GLM_INCLUDE_DIR}
   ${APACHE_INCLUDE_DIR}
   ${VALGRIND_INCLUDE_DIR}
   ${APR_INCLUDE_DIR}
+  ${TURBOJPEG_INCLUDE_DIR}
   ${QT_INCLUDE_DIR}
   ${QT_QTOPENGL_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS})
@@ -239,6 +255,7 @@ IF( Tinia_BUILD_EXAMPLES )
   ENDIF()
   ADD_SUBDIRECTORY( "examples/cuberenderer")
   ADD_SUBDIRECTORY( "examples/auto_proxy_test")
+  ADD_SUBDIRECTORY( "examples/jpg_proxy_test")
   ADD_SUBDIRECTORY( "examples/changerestrictions")
   ADD_SUBDIRECTORY( "examples/clock_example")
   ADD_SUBDIRECTORY( "examples/twocanvases") 

examples/jpg_proxy_test/CMakeLists.txt

@@ -0,0 +1,66 @@
+# jpc = jpg proxy cube
+
+SET( jpc_qt_job_SOURCES "JPCJob.cpp" "main.cpp" )
+SET( jpc_job_HEADERS "JPCJob.hpp" "utils.hpp" )
+IF(Tinia_DESKTOP)
+  ADD_EXECUTABLE(jpc_qt_job
+    ${jpc_qt_job_SOURCES}
+    ${jpc_job_HEADERS}
+    )
+  TARGET_LINK_LIBRARIES(jpc_qt_job
+      ${LIBXML2_LIBRARIES} 
+    tinia_qtcontroller
+    tinia_renderlist
+    tinia_renderlistgl
+    ${QT_LIBRARIES}
+    ${QT_QTOPENGL_LIBRARIES}
+    ${OPENGL_LIBRARIES}
+    ${GLEW_LIBRARY}
+    tinia_model
+    tinia_jobcontroller
+    ${Boost_LIBRARIES}
+    )
+
+    INSTALL( TARGETS jpc_qt_job
+        EXPORT TiniaTargets
+        RUNTIME DESTINATION bin
+        COMPONENT jpc_qt_job
+    )
+
+
+
+ENDIF()
+
+
+IF(Tinia_SERVER)
+  SET( jpc_cloud_job_SOURCES "JPCJob.cpp" "cloud_main.cpp" )
+
+  ADD_EXECUTABLE(jpc_cloud_job
+    ${jpc_cloud_job_SOURCES}
+    ${jpc_job_HEADERS}
+    )
+
+  TARGET_LINK_LIBRARIES(jpc_cloud_job
+    ${RT}
+    ${LIB_APR}
+    ${GLEW_LIBRARY}
+    ${OPENGL_LIBRARIES}
+    ${Boost_LIBRARIES} 
+    ${LIBXML2_LIBRARIES} 
+    tinia_model 
+    tinia_modelxml
+    tinia_renderlist
+    tinia_renderlistgl
+    tinia_jobcontroller
+    tinia_trell
+    )
+
+
+  INSTALL(TARGETS
+    jpc_cloud_job
+    EXPORT TiniaTargets
+    RUNTIME
+    DESTINATION var/trell/apps/
+    COMPONENT mod_trell
+    )
+ENDIF()