diff options
| author | Tony-LunarG <tony@lunarg.com> | 2018-05-22 13:26:26 -0600 |
|---|---|---|
| committer | Tony-LunarG <tony@lunarg.com> | 2018-05-22 13:26:26 -0600 |
| commit | 2478fee6df5eae86059efbc30ac764c1f7bc799a (patch) | |
| tree | 78d22d12ab66c010e64dbf98993127cf67eb0452 | |
| parent | ebda227dc0f9324907245bc46832389068459fd7 (diff) | |
| download | usermoji-2478fee6df5eae86059efbc30ac764c1f7bc799a.tar.xz | |
Tools: Better search for glslang + loader
Change-Id: I1652a5bc29623980e80dad168997fd75d08467e8
| -rw-r--r-- | cube/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | vulkaninfo/CMakeLists.txt | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index a6db96cc..3bbce8cf 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -9,12 +9,12 @@ set(PYTHON_CMD ${PYTHON_EXECUTABLE}) set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") -if(DEFINED GLSLANG_INSTALL_DIR) +if(GLSLANG_INSTALL_DIR) message(STATUS "Using GLSLANG_INSTALL_DIR to look for glslangValidator") find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_INSTALL_DIR}/bin" ) -elseif(DEFINED GLSLANG_REPO_ROOT) +elseif(GLSLANG_REPO_ROOT) message(STATUS "Using glslang_repo_root to look for glslangValidator") find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_REPO_ROOT}/build/standalone/release" @@ -144,7 +144,10 @@ file(COPY ${TEXTURES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -if(DEFINED LOADER_REPO_ROOT) +# Predefine loader root as a cmake cache variable for cmake-gui +set(LOADER_REPO_ROOT "LOADER-NOTFOUND" CACHE PATH "Absolute path to the root of the loader repository") + +if(LOADER_REPO_ROOT) message(STATUS "Using user-supplied path to locate Vulkan") if(WIN32) set (LOADER_SEARCH_PATHS diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt index 81a3896f..1deef2ec 100644 --- a/vulkaninfo/CMakeLists.txt +++ b/vulkaninfo/CMakeLists.txt @@ -14,7 +14,10 @@ endif() if(APPLE) endif() -if(DEFINED LOADER_REPO_ROOT) +# Predefine loader root as a cmake cache variable for cmake-gui +set(LOADER_REPO_ROOT "LOADER-NOTFOUND" CACHE PATH "Absolute path to the root of the loader repository") + +if(LOADER_REPO_ROOT) message(STATUS "Using user-supplied path to locate Vulkan") if(WIN32) set (LOADER_SEARCH_PATHS |