X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=CMakeLists.txt;h=67bbb3c2492f6b0a2762f114d9705d39a3d4d10d;hp=d45e557b6fc090b88c45b0664ad011f249833200;hb=009c029e5360c8ae668b21caffeb275639ede8a7;hpb=73889a4a15f4868645adf9e87abf0b4352faadc2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d45e557..67bbb3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,23 @@ cmake_minimum_required (VERSION 2.8)
 
 project (apitrace-tests)
 
+find_path (APITRACE_SOURCE_DIR NAMES cmake/FindDirectX.cmake PATHS .. ../.. DOC "apitrace source tree" NO_DEFAULT_PATH)
+if (NOT EXISTS ${APITRACE_SOURCE_DIR})
+    message (SEND_ERROR "Please specify path to apitrace source tree via APITRACE_SOURCE_DIR")
+endif ()
+
+find_program (APITRACE_EXECUTABLE NAMES apitrace PATHS ${APITRACE_SOURCE_DIR} DOC "apitrace executable")
+if (NOT EXISTS ${APITRACE_EXECUTABLE})
+    message (SEND_ERROR "Please specify path to apitrace executable via APITRACE_EXECUTABLE")
+endif ()
+
 include (FindPkgConfig)
 
+if (APITRACE_SOURCE_DIR)
+    set (CMAKE_MODULE_PATH ${APITRACE_SOURCE_DIR}/cmake)
+    find_package (DirectX)
+endif ()
+
 # Set default built type
 if (NOT CMAKE_BUILD_TYPE)
    set (CMAKE_BUILD_TYPE Debug
@@ -24,7 +39,6 @@ if (NOT WIN32)
 	pkg_check_modules (EGL egl)
 	pkg_check_modules (GLESV1 glesv1_cm)
 	pkg_check_modules (GLESV2 glesv2)
-	pkg_check_modules (VG vg)
 endif ()
 
 if (UNIX)
@@ -65,14 +79,8 @@ if (MSVC)
 	add_definitions (-wd4244) # conversion' conversion from 'type1' to 'type2', possible loss of data
 endif ()
 
-if (NOT APITRACE_BINARY_DIR) 
-    set (APITRACE_BINARY_DIR "${CMAKE_BINARY_DIR}/.." CACHE PATH "apitrace build directory")
-endif ()
-if (NOT EXISTS ${APITRACE_BINARY_DIR})
-    message (SEND_ERROR "Invalid APITRACE_BINARY_DIR")
-endif ()
-
 enable_testing()
 
 add_subdirectory (apps)
+add_subdirectory (traces)