Vulkan Configurator 3

CMakeLists.txt

@@ -30,7 +30,6 @@ find_package(valijson REQUIRED CONFIG)
 
 option(BUILD_TESTS "Build tests")
 option(RUN_ON_GITHUB "Build only tests that can run on Github" OFF)
-option(BUILD_EXPERIMENTAL "Build tests for debugging layers" OFF)
 
 if(BUILD_TESTS)
     enable_testing()
@@ -116,8 +115,6 @@ if(BUILD_LAYERMGR)
     endif()
 
     add_subdirectory(vkconfig_core)
-    add_subdirectory(vkconfig)
-    if(BUILD_EXPERIMENTAL)
-        add_subdirectory(vkconfig3)
-    endif()
+    add_subdirectory(vkconfig_cmd)
+    add_subdirectory(vkconfig_gui)
 endif()

scripts/github_ci_linux.py

@@ -89,9 +89,9 @@ def BuildVT(args):
     RunShellCmd(test_cmd, VT_BUILD_DIR)
 
     print("Build Vulkan Configurator with QtCreator")
-    os.chdir('%s/../vkconfig' % VT_BUILD_DIR)
-    RunShellCmd('qmake vkconfig.pro', '%s/../vkconfig' % VT_BUILD_DIR)
-    RunShellCmd('make', '%s/../vkconfig' % VT_BUILD_DIR)
+    os.chdir('%s/../vkconfig_gui' % VT_BUILD_DIR)
+    RunShellCmd('qmake vkconfig.pro', '%s/../vkconfig_gui' % VT_BUILD_DIR)
+    RunShellCmd('make', '%s/../vkconfig_gui' % VT_BUILD_DIR)
 
 ret_code = 0
 def RunATest(vt_cmd, vt_env):