X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=CMakeLists.txt;h=47c38cb06b3bfb488b699269d309c93c2edc1a57;hp=7975877eb5ce776af09d7b3ea87be0cc6ee7448d;hb=99bb09c80a5f3bbe7ed0b8954653db44fa3574f0;hpb=007d3dd1a9ca4b00cdb81d7b72a608687c024d50

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7975877..47c38cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,30 @@
 cmake_minimum_required (VERSION 2.8)
 
+
+# Use clang on MacOSX. gcc doesn't support __thread key, and Apple has
+# abandoned it for clang.  This must be done before the project is defined.
+if (APPLE)
+    set (CMAKE_C_COMPILER "clang")
+    set (CMAKE_CXX_COMPILER "clang++")
+endif ()
+
+
 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
@@ -10,16 +33,19 @@ if (NOT CMAKE_BUILD_TYPE)
        FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
 
-find_package (OpenGL REQUIRED)
-find_package (GLUT)
+include (CMakeParseArguments)
 
-find_library (GLEW_glew_LIBRARY GLEW
-	/usr/lib
-)
+find_package (OpenGL)
+find_package (GLUT)
+find_package (GLEW)
 
-find_path (GLEW_INCLUDE_DIR GL/glew.h
-      /usr/include/GL
-)
+if (WIN32)
+    find_package (DirectX)
+elseif (PKG_CONFIG_FOUND)
+	pkg_check_modules (EGL egl)
+	pkg_check_modules (GLESV1 glesv1_cm)
+	pkg_check_modules (GLESV2 glesv2)
+endif ()
 
 if (UNIX)
 	link_libraries(m)
@@ -59,14 +85,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)