X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=CMakeLists.txt;h=47c38cb06b3bfb488b699269d309c93c2edc1a57;hp=67bbb3c2492f6b0a2762f114d9705d39a3d4d10d;hb=99bb09c80a5f3bbe7ed0b8954653db44fa3574f0;hpb=799a2cd3f002cb517b0c461ee0cb9feb31dc5761

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67bbb3c..47c38cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,29 @@
 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 (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)
 
-if (APITRACE_SOURCE_DIR)
-    set (CMAKE_MODULE_PATH ${APITRACE_SOURCE_DIR}/cmake)
-    find_package (DirectX)
-endif ()
+set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 # Set default built type
 if (NOT CMAKE_BUILD_TYPE)
@@ -29,13 +35,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)
+elseif (PKG_CONFIG_FOUND)
 	pkg_check_modules (EGL egl)
 	pkg_check_modules (GLESV1 glesv1_cm)
 	pkg_check_modules (GLESV2 glesv2)