From c5c6265c026e4d6cc2826aedf86f5eb352dc470d Mon Sep 17 00:00:00 2001 From: Nathaniel Cesario Date: Wed, 23 Sep 2020 17:46:04 -0600 Subject: build: Fix linux/windows build in single directory Allows a single worktree to be used by multiple platforms for builds. Change-Id: I5078eaee6f62757ebb431fdc22405cab77d2356e --- cube/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cube') diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index b3fce384..53c7f2bd 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -38,7 +38,14 @@ else() elseif(UNIX AND NOT APPLE) # i.e. Linux execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip) endif() - find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS "${PROJECT_SOURCE_DIR}/glslang/bin") + if (WIN32) + set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin") + elseif(APPLE) + set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin") + else() + set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin") + endif() + find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR}) endif() if(UNIX AND NOT APPLE) # i.e. Linux -- cgit v1.2.3