diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2018-05-12 16:43:33 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-05-12 16:43:33 -0600 |
| commit | 677938465b6cdb9193404db8a8cbf447a1992bed (patch) | |
| tree | d0d92039a8d1e4631bba1761dd9453d37c85b3b6 /cube | |
| parent | 25ceac61b78771ec9633645c887b1350657a6d4a (diff) | |
| download | usermoji-677938465b6cdb9193404db8a8cbf447a1992bed.tar.xz | |
cmake: Use GLSLANG_REPO_ROOT to find glslangValidator
Diffstat (limited to 'cube')
| -rw-r--r-- | cube/CMakeLists.txt | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index 58bf9654..2d7ab604 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -3,11 +3,20 @@ set(CUBE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/.. ) -find_program(GLSLANG_VALIDATOR NAMES glslangValidator - HINTS "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/bin" - "$ENV{VK_SDK_PATH}/bin" - "${GLSLANG_BINARY_ROOT}/StandAlone" - "${PROJECT_SOURCE_DIR}/external/${BINDATA_DIR}") +if(NOT DEFINED GLSLANG_REPO_ROOT) + message(STATUS "Using cmake find_program to look for glslangValidator") + find_program(GLSLANG_VALIDATOR NAMES glslangValidator + HINTS "$ENV{VULKAN_SDK}/bin" + ) +else() + message(STATUS "Using glslang_repo_root to look for glslangValidator") + find_program(GLSLANG_VALIDATOR names glslangValidator + HINTS "${GLSLANG_REPO_ROOT}/build/standalone/release" + HINTS "${GLSLANG_REPO_ROOT}/build/standalone/debug" + HINTS "${GLSLANG_REPO_ROOT}/build32/standalone/release" + HINTS "${GLSLANG_REPO_ROOT}/build32/standalone/debug" + ) +endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") include(FindPkgConfig) |