Allow to build samples without apitrace source tree.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc59753ef3ec470deda54961c545a21998242d6d..9dee9dee82ae65888ff615c5fd15dca4e608e3f6 100644 (file)
--- 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})
 
 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})
 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)
 endif ()
 
 include (FindPkgConfig)

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 6f38fdd74759f763d69ab5725a690f349525d128..932b18da4c53bbacd77e692c9a2670c49b98d87a 100644 (file)
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -10,18 +10,20 @@ function (ADD_APP_TEST)
         ${ARGN}
     )
 
         ${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}
-            --
-            "$<TARGET_FILE:${TEST_TARGET}>"
-            ${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}
+                --
+                "$<TARGET_FILE:${TEST_TARGET}>"
+                ${TEST_ARGS}
+        )
+    endif ()

 endfunction ()
 
 if (OPENGL_FOUND AND GLEW_FOUND AND GLUT_FOUND)
 endfunction ()
 
 if (OPENGL_FOUND AND GLEW_FOUND AND GLUT_FOUND)

diff --git a/traces/CMakeLists.txt b/traces/CMakeLists.txt
index 983be78a58735e6df5e01afa460b50aebe6494c6..3b7fc3f85e41473cff27f30ae5ca6d94e6944f01 100644 (file)
--- 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})
 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)
 endforeach (script)