From abcc90de078e99824aede4a1bf56cef3924339e6 Mon Sep 17 00:00:00 2001 From: Tony Barbour Date: Thu, 21 May 2015 11:07:47 -0600 Subject: tests: Cmake changes for building on Windows --- CMakeLists.txt | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e4367eb..329bb274 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,31 +23,33 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") endif() endif() -if (NOT WIN32) - # Hard code our LunarGLASS and glslang paths for now - get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE) - get_filename_component(LUNARGLASS_PREFIX ../LunarGLASS ABSOLUTE) +# Hard code our LunarGLASS and glslang paths for now +get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE) +get_filename_component(LUNARGLASS_PREFIX ../LunarGLASS ABSOLUTE) - if(NOT EXISTS ${GLSLANG_PREFIX}) - message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX}) - endif() +if(NOT EXISTS ${GLSLANG_PREFIX}) + message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX}) +endif() +if(NOT WIN32) if(NOT EXISTS ${LUNARGLASS_PREFIX}) - message(FATAL_ERROR "Necessary LunarGLASS components do not exist: " ${GLSLANG_PREFIX}) + message(FATAL_ERROR "Necessary LunarGLASS components do not exist: " ${LUNARGLASS_PREFIX}) endif() - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(PYTHON_CMD "python3") endif() else() - set(PYTHON_CMD "py") + set(PYTHON_CMD "py") endif() +option(BUILD_TESTS "Build tests" ON) + # loader: Generic VULKAN ICD loader # icd: Device dependent (DD) VULKAN components # tests: VULKAN tests add_subdirectory(loader) add_subdirectory(icd) -if (NOT WIN32) +if(BUILD_TESTS) add_subdirectory(tests) endif() add_subdirectory(layers) -- cgit v1.2.3