diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2018-04-11 15:15:31 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-05-11 20:10:23 -0600 |
| commit | a38c5c82909a579170bf8f940dda89161a5e29f7 (patch) | |
| tree | fe3555c62b727217035180604a81ef156e174c2f /cube | |
| parent | 6e590c31d0ceaf3edc717d4e79aacc9afed46f5c (diff) | |
| download | usermoji-a38c5c82909a579170bf8f940dda89161a5e29f7.tar.xz | |
cmake: Clean up main cmakelists.txt file
Delete unnecessary cmake, move non-common stuff to consitituent cmake
files.
Change-Id: I158c50511a2b9810f6b2fa198d4d8aee5a23ac93
Diffstat (limited to 'cube')
| -rw-r--r-- | cube/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index d437cf8f..92a9a3f2 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -3,6 +3,12 @@ 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(CMAKE_SYSTEM_NAME STREQUAL "Linux") include(FindPkgConfig) option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) @@ -40,10 +46,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf") endif() - set(CUBE_INCLUDE_DIRS - "${PROJECT_SOURCE_DIR}/icd/common" - ${CUBE_INCLUDE_DIRS} - ) elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") @@ -97,7 +99,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") message( FATAL_ERROR "Unrecognized value for CUBE_WSI_SELECTION: ${CUBE_WSI_SELECTION}" ) endif() - include_directories ("${PROJECT_SOURCE_DIR}/icd/common") link_libraries(${API_LOWERCASE} m) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") add_definitions(-DVK_USE_PLATFORM_MACOS_MVK) |