Move generation of files to cmake

[vogl] / src / vogltrace / CMakeLists.txt

diff --git a/src/vogltrace/CMakeLists.txt b/src/vogltrace/CMakeLists.txt
index dbf66ce314e8950c04300d6a204c0e15e260ea5f..66566a91d166e41acf128179c839e96f8b505972 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
@@ -39,7 +37,7 @@ include_directories(
     ${SRC_DIR}/libbacktrace
     ${SRC_DIR}/extlib/loki/include/loki
     ${SRC_DIR}/voglcommon
-    ${SRC_DIR}/voglinc
+    ${CMAKE_BINARY_DIR}/voglinc
     ${SRC_DIR}/voglcore
     ${SRC_DIR}/libtelemetry
     )
@@ -49,6 +47,7 @@ add_shared_linker_flag("-Wl,-Bsymbolic")
 add_shared_linker_flag("-Wl,--version-script=${PROJECT_SOURCE_DIR}/libvogltrace_linker_script.txt")
 
 add_library(${PROJECT_NAME} SHARED ${SRC_LIST})
+add_dependencies(${PROJECT_NAME} voglgen_make_inc)
 
 target_link_libraries(${PROJECT_NAME}
     ${TELEMETRY_LIBRARY}
@@ -57,9 +56,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()