From 9537d57b54991a391b24fd00426ec9d297eca999 Mon Sep 17 00:00:00 2001 From: Mark Callow Date: Thu, 1 Aug 2024 10:35:22 +0900 Subject: [PATCH] Remove variable prints and unneeded code. Cleanup. --- tests/loadtests/CMakeLists.txt | 6 ++---- tests/loadtests/vkloadtests.cmake | 17 ++++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/loadtests/CMakeLists.txt b/tests/loadtests/CMakeLists.txt index 93e21a93de..948cde5b55 100644 --- a/tests/loadtests/CMakeLists.txt +++ b/tests/loadtests/CMakeLists.txt @@ -31,11 +31,9 @@ set( CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE ) # generator is adding it. It leads to a harmless warning during # build, harmless because the libraries are referenced by full paths # and the .../lib directory is in the search path of SDL2::SDL2. -cmake_print_variables(CMAKE_PREFIX_PATH CMAKE_SYSTEM_PREFIX_PATH - CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_APPBUNDLE_PATH) -# set(CMAKE_FIND_DEBUG_MODE TRUE) +#set(CMAKE_FIND_DEBUG_MODE TRUE) find_package(SDL2 REQUIRED) -# set(CMAKE_FIND_DEBUG_MODE FALSE) +#set(CMAKE_FIND_DEBUG_MODE FALSE) if(NOT EMSCRIPTEN) # There is no official assimp port for Emscripten, and we've had # no time to experiment, so tests that use assimp are omitted from diff --git a/tests/loadtests/vkloadtests.cmake b/tests/loadtests/vkloadtests.cmake index e303c8ac69..80d293a43e 100644 --- a/tests/loadtests/vkloadtests.cmake +++ b/tests/loadtests/vkloadtests.cmake @@ -3,8 +3,6 @@ # Find Vulkan package if(APPLE) - cmake_print_variables(CMAKE_FIND_FRAMEWORK) - cmake_print_variables(CMAKE_PREFIX_PATH CMAKE_LIBRARY_PATH CMAKE_FRAMEWORK_PATH) # N.B. FindVulkan needs the VULKAN_SDK environment variable set to find # the iOS frameworks and to set Vulkan_Target_SDK, used later in this # file. Therefore ensure to make that env. var. available to CMake and @@ -40,17 +38,14 @@ if(APPLE) endif() else() find_package(Vulkan REQUIRED) -# if(Vulkan_FOUND) -# # Once we've moved on to CMake 3.20 -# #cmake_path(REMOVE_FILENAME ${Vulkan_LIBRARY} OUTPUT_VARIABLE Vulkan_LIBRARY_DIR) -# # Until then -# string(REGEX REPLACE lib/.*$ lib/ Vulkan_LIBRARY_DIR ${Vulkan_LIBRARY}) -# message(STATUS "Found Vulkan at ${Vulkan_INCLUDE_DIR} & ${Vulkan_LIBRARY}") -# endif() endif() -cmake_path(REMOVE_FILENAME Vulkan_LIBRARIES OUTPUT_VARIABLE Vulkan_LIBRARIES_DIR) -cmake_print_variables(Vulkan_LIBRARIES Vulkan_LIBRARY_REAL_PATH_NAME Vulkan_LIBRARY_REAL_FILE_NAME Vulkan_LIBRARY_SONAME_FILE_NAME) +#cmake_print_variables( +# Vulkan_LIBRARIES +# Vulkan_LIBRARY_REAL_PATH_NAME +# Vulkan_LIBRARY_REAL_FILE_NAME +# Vulkan_LIBRARY_SONAME_FILE_NAME +#) include(compile_shader.cmake)