X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=CMakeLists.txt;h=9dee9dee82ae65888ff615c5fd15dca4e608e3f6;hp=1cd54f0da69cd31295ad939b29fb32a0e56dabe6;hb=5a26553410dc781b71da75c163400b801dfbf34a;hpb=13d16674b433dec55cdbe93bbacbf2f44b532945

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cd54f0..9dee9de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,20 @@ 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 (WARNING "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 (WARNING "Please specify path to apitrace executable via APITRACE_EXECUTABLE")
+endif ()
+
 include (FindPkgConfig)
 
+set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
 # Set default built type
 if (NOT CMAKE_BUILD_TYPE)
    set (CMAKE_BUILD_TYPE Debug
@@ -14,13 +26,13 @@ endif (NOT CMAKE_BUILD_TYPE)
 
 include (CMakeParseArguments)
 
-find_package (OpenGL REQUIRED)
+find_package (OpenGL)
 find_package (GLUT)
+find_package (GLEW)
 
-find_path (GLEW_INCLUDE_DIR GL/glew.h /usr/include/GL)
-find_library (GLEW_glew_LIBRARY GLEW /usr/lib)
-
-if (NOT WIN32)
+if (WIN32)
+    find_package (DirectX)
+else ()
 	pkg_check_modules (EGL egl)
 	pkg_check_modules (GLESV1 glesv1_cm)
 	pkg_check_modules (GLESV2 glesv2)
@@ -64,13 +76,6 @@ 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)