X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=CMakeLists.txt;h=9dee9dee82ae65888ff615c5fd15dca4e608e3f6;hp=c6a8a59744c458904ba5c5ef5ad629cba50b8183;hb=77cd7db1b4deb6f373d708054fced68a9709e9a6;hpb=1865e971eb6f6ebbf43a0d21bc8486f2476d1e71

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6a8a59..9dee9de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,23 +4,18 @@ 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")
+    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 (SEND_ERROR "Please specify path to apitrace executable via APITRACE_EXECUTABLE")
+    message (WARNING "Please specify path to apitrace executable via APITRACE_EXECUTABLE")
 endif ()
 
 include (FindPkgConfig)
 
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-if (APITRACE_SOURCE_DIR)
-    set (CMAKE_MODULE_PATH ${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
@@ -35,7 +30,9 @@ find_package (OpenGL)
 find_package (GLUT)
 find_package (GLEW)
 
-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)