From: Gregory King <greg.james.king@gmail.com>
Date: Mon, 17 Mar 2014 20:15:37 +0000 (-0700)
Subject: Reworked src/vogltrace/CMakeLists.txt to fix issue 16;
X-Git-Url: https://git.cworth.org/git?p=vogl;a=commitdiff_plain;h=414c003257a481cb4e23c610317745958cd6031d

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 dbf66ce..6320b4e 100644
--- 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()