From 609cb3a9519a3cd91f0975c95bfbc552fde707ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 9 May 2012 11:14:08 +0100 Subject: [PATCH 1/1] Allow to build samples without apitrace source tree. --- CMakeLists.txt | 4 ++-- apps/CMakeLists.txt | 26 ++++++++++++++------------ traces/CMakeLists.txt | 18 ++++++++++-------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc59753..9dee9de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,12 @@ 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) diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 6f38fdd..932b18d 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -10,18 +10,20 @@ function (ADD_APP_TEST) ${ARGN} ) - add_test( - NAME app_${TEST_NAME} - COMMAND - python ${CMAKE_SOURCE_DIR}/app_driver.py - --apitrace ${APITRACE_EXECUTABLE} - --apitrace-source ${APITRACE_SOURCE_DIR} - --api ${api} - --ref-dump ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_REF} - -- - "$" - ${TEST_ARGS} - ) + if (APITRACE_EXECUTABLE AND APITRACE_SOURCE_DIR) + add_test( + NAME app_${TEST_NAME} + COMMAND + python ${CMAKE_SOURCE_DIR}/app_driver.py + --apitrace ${APITRACE_EXECUTABLE} + --apitrace-source ${APITRACE_SOURCE_DIR} + --api ${api} + --ref-dump ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_REF} + -- + "$" + ${TEST_ARGS} + ) + endif () endfunction () if (OPENGL_FOUND AND GLEW_FOUND AND GLUT_FOUND) diff --git a/traces/CMakeLists.txt b/traces/CMakeLists.txt index 983be78..3b7fc3f 100644 --- a/traces/CMakeLists.txt +++ b/traces/CMakeLists.txt @@ -3,12 +3,14 @@ file (GLOB scripts RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.script) list (SORT scripts) foreach (script ${scripts}) - add_test( - NAME ${script} - COMMAND - python ${CMAKE_SOURCE_DIR}/tool_driver.py - --apitrace ${APITRACE_EXECUTABLE} - --apitrace-source ${APITRACE_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/${script} - ) + if (APITRACE_EXECUTABLE AND APITRACE_SOURCE_DIR) + add_test( + NAME ${script} + COMMAND + python ${CMAKE_SOURCE_DIR}/tool_driver.py + --apitrace ${APITRACE_EXECUTABLE} + --apitrace-source ${APITRACE_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/${script} + ) + endif () endforeach (script) -- 2.43.0