diff options
| author | Nathaniel Cesario <nathaniel@lunarg.com> | 2020-09-23 17:46:04 -0600 |
|---|---|---|
| committer | ncesario-lunarg <71668273+ncesario-lunarg@users.noreply.github.com> | 2020-09-29 15:04:56 -0600 |
| commit | c5c6265c026e4d6cc2826aedf86f5eb352dc470d (patch) | |
| tree | 0008828549923b5175b2fb8b6fa88e9b93388bc4 /cube | |
| parent | 02cdef3dfe626c2b8f35c7706c04592a3cf78308 (diff) | |
| download | usermoji-c5c6265c026e4d6cc2826aedf86f5eb352dc470d.tar.xz | |
build: Fix linux/windows build in single directory
Allows a single worktree to be used by multiple platforms for builds.
Change-Id: I5078eaee6f62757ebb431fdc22405cab77d2356e
Diffstat (limited to 'cube')
| -rw-r--r-- | cube/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
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 |