|
 |
792be1 |
diff -up Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/demos/CMakeLists.txt.smoke Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/demos/CMakeLists.txt
|
|
|
792be1 |
--- Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/demos/CMakeLists.txt.smoke 2018-05-08 10:00:26.738964106 +1000
|
|
|
792be1 |
+++ Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/demos/CMakeLists.txt 2018-05-08 10:01:39.240848209 +1000
|
|
|
792be1 |
@@ -173,54 +173,3 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
|
|
|
792be1 |
endif()
|
|
|
4f44ac |
endif()
|
|
|
4f44ac |
|
|
|
792be1 |
-######################################################################################
|
|
|
792be1 |
-# cube
|
|
|
4f44ac |
-
|
|
|
792be1 |
-if(APPLE)
|
|
|
792be1 |
- include(macOS/cube/cube.cmake)
|
|
|
792be1 |
-elseif(NOT WIN32)
|
|
|
4f44ac |
- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
|
|
792be1 |
- add_executable(cube cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
|
|
|
4f44ac |
- target_link_libraries(cube ${LIBRARIES})
|
|
|
4f44ac |
- endif()
|
|
|
4f44ac |
-else()
|
|
|
4f44ac |
- if (CMAKE_CL_64)
|
|
|
4f44ac |
- set (LIB_DIR "Win64")
|
|
|
4f44ac |
- else()
|
|
|
4f44ac |
- set (LIB_DIR "Win32")
|
|
|
4f44ac |
- endif()
|
|
|
4f44ac |
-
|
|
|
792be1 |
- add_executable(cube WIN32 cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
|
|
|
4f44ac |
- target_link_libraries(cube ${LIBRARIES})
|
|
|
4f44ac |
-endif()
|
|
|
4f44ac |
-
|
|
|
792be1 |
-######################################################################################
|
|
|
792be1 |
-# cubepp
|
|
|
792be1 |
-
|
|
|
792be1 |
-if(APPLE)
|
|
|
792be1 |
- include(macOS/cubepp/cubepp.cmake)
|
|
|
792be1 |
-elseif(NOT WIN32)
|
|
|
4f44ac |
- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
|
|
792be1 |
- add_executable(cubepp cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
|
|
|
4f44ac |
- target_link_libraries(cubepp ${LIBRARIES})
|
|
|
4f44ac |
- endif()
|
|
|
4f44ac |
-else()
|
|
|
4f44ac |
- if (CMAKE_CL_64)
|
|
|
4f44ac |
- set (LIB_DIR "Win64")
|
|
|
4f44ac |
- else()
|
|
|
4f44ac |
- set (LIB_DIR "Win32")
|
|
|
4f44ac |
- endif()
|
|
|
4f44ac |
-
|
|
|
792be1 |
- add_executable(cubepp WIN32 cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
|
|
|
4f44ac |
- target_link_libraries(cubepp ${LIBRARIES})
|
|
|
4f44ac |
-endif()
|
|
|
4f44ac |
-
|
|
|
792be1 |
-######################################################################################
|
|
|
792be1 |
-# smoke
|
|
|
792be1 |
-
|
|
|
792be1 |
-if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}))
|
|
|
792be1 |
- if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR
|
|
|
792be1 |
- (CMAKE_SYSTEM_NAME STREQUAL "Android") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
|
|
|
792be1 |
- add_subdirectory(smoke)
|
|
|
792be1 |
- endif()
|
|
|
792be1 |
-endif()
|