X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=CMakeLists.txt;h=d4f11ad8c96d27d04dec864bfa9c5f821baebe5e;hp=2dff8574de0d8db7b37d5c3cc18e6d6b8c59d2e1;hb=78f3329f3481c13886be0189c58b98ee29a4c484;hpb=5efeef24814e1744e3c4f3109f82e700576439ab diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dff857..d4f11ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 2.8) - +INCLUDE (FindPythonInterp) # 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. @@ -21,6 +21,7 @@ if (NOT EXISTS ${APITRACE_EXECUTABLE}) message (WARNING "Please specify path to apitrace executable via APITRACE_EXECUTABLE") endif () +include (FindPythonInterp) include (FindPkgConfig) set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) @@ -50,7 +51,7 @@ endif () # Check for the presence of several python packages, which are needed to build # generated tests. execute_process( - COMMAND ${python} -c "import PIL" + COMMAND ${PYTHON_EXECUTABLE} -c "import PIL" OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE IMPORT_PIL_RESULT) @@ -108,7 +109,7 @@ add_subdirectory (traces) # portable across all platforms. However, these tests all rely on # doing image comparisons and the current implementation of the # "apitrace dump-images" command relies on direct invocation of the -# glretrace command. +# glreplay command. # # Someday, we should have more unified commands for replaying traces, # dumping images, etc. At that point these cli tests should be usable