diff options
| author | David Pinedo <david@lunarg.com> | 2015-07-09 17:46:19 -0600 |
|---|---|---|
| committer | David Pinedo <david@lunarg.com> | 2015-07-09 17:46:19 -0600 |
| commit | 20e748a664a2ad6d03e0bf45aca0db7dfff652de (patch) | |
| tree | 8307582d6af6bfacab1f48c2435952de9785dbe0 | |
| parent | ed008740ee2398e1527abb1cae9da804bfd88441 (diff) | |
| download | usermoji-20e748a664a2ad6d03e0bf45aca0db7dfff652de.tar.xz | |
Build: re-enable build of tests on Linux, enable build of null drv on Windows
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | icd/CMakeLists.txt | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d30a4b0..da5d5265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,16 +46,19 @@ else() set(PYTHON_CMD "py") endif() -#option(BUILD_TESTS "Build tests" ON) +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(BUILD_TESTS) -# add_subdirectory(tests) -#endif() +if(NOT WIN32) + # TODO: Tests don't build on Windows + if(BUILD_TESTS) + add_subdirectory(tests) + endif() +endif() add_subdirectory(layers) add_subdirectory(demos) #add_subdirectory(tools/glave) diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt index ddd542c5..74d24144 100644 --- a/icd/CMakeLists.txt +++ b/icd/CMakeLists.txt @@ -13,7 +13,8 @@ else() endif() add_subdirectory(common) -#add_subdirectory(nulldrv) -if (NOT WIN32) +if (WIN32) + add_subdirectory(nulldrv) +else() add_subdirectory(intel) endif() |