Reworked src/vogltrace/CMakeLists.txt to fix issue 16;

 (1) requires a symbolic link between libturbojpeg.so.0 to
     libturbojpeg.so (within the search path)
 (2) Switched ${X11_X11_LIB} to ${X11_LIBRARIES}
 (3) Moved project definition to top of the file;

diff --git a/src/vogltrace/CMakeLists.txt b/src/vogltrace/CMakeLists.txt
index dbf66ce314e8950c04300d6a204c0e15e260ea5f..6320b4eef8024f46eace95e91a11f3fee0216204 100644 (file)
--- a/src/vogltrace/CMakeLists.txt
+++ b/src/vogltrace/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
+project(vogltrace)
 
 option(VOGLTRACE_NO_PUBLIC_EXPORTS "Don't define any public GL exports in libvogltraceXX.so, this .so will only be useful for manual loading" FALSE)
 
@@ -9,11 +10,8 @@ if (NOT CMAKE_USE_PTHREADS_INIT)
 endif ()
 find_package(X11 REQUIRED)
 
-project(vogltrace)
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-
 add_compiler_flag("-DVOGL_REMOTING")
 
 set(SRC_LIST
@@ -57,9 +55,9 @@ target_link_libraries(${PROJECT_NAME}
     voglcore
     ${CMAKE_THREAD_LIBS_INIT}
     ${CMAKE_DL_LIBS}
-    ${X11_X11_LIB}
-    libturbojpeg.a
+    ${X11_LIBRARIES}
     rt
+    turbojpeg
     )
 
 build_options_finalize()