Add missing file to glxtrace.so

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b530f2efd9f4ba4a0eb23ea3e3ba81cbba9464..6f22249cf38e1f702694a7053b002662350226ff 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,7 @@ endif ()
 
 # Put all executables into the same top level build directory, regardless of
 # which subdirectory they are declared
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 
 ##############################################################################
@@ -139,6 +139,8 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
 ##############################################################################
 # Common libraries / utilities
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
 add_custom_command (
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
@@ -153,10 +155,20 @@ else (WIN32)
     set (glws glws_glx.cpp)
 endif (WIN32)
 
-add_library (trace trace_model.cpp trace_parser.cpp trace_writer.cpp trace_model_writer.cpp ${os})
+add_library (common
+    trace_model.cpp
+    trace_parser.cpp
+    trace_writer.cpp
+    trace_model_writer.cpp
+    image.cpp
+    image_bmp.cpp
+    image_pnm.cpp
+    image_png.cpp
+    ${os}
+)
 
 add_executable (tracedump tracedump.cpp)
-target_link_libraries (tracedump trace)
+target_link_libraries (tracedump common)
 install (TARGETS tracedump RUNTIME DESTINATION bin) 
 
 
@@ -282,6 +294,7 @@ else ()
         glsnapshot.cpp
         trace_writer.cpp
         image.cpp
+        image_png.cpp
         os_posix.cpp
     )
 
@@ -343,7 +356,7 @@ set_property (
 )
 
 target_link_libraries (glretrace
-    trace
+    common
 )
 
 if (WIN32)
@@ -374,7 +387,7 @@ endif (QT4_FOUND AND QJSON_FOUND)
 ##############################################################################
 # Packaging
 
-install (FILES LICENSE README TODO DESTINATION doc)
+install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
 
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
 set (CPACK_PACKAGE_VERSION_MINOR "0")