Skip to content

Commit

Permalink
Remove variable prints and unneeded code. Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkCallow committed Aug 1, 2024
1 parent e322ca3 commit 9537d57
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
6 changes: 2 additions & 4 deletions tests/loadtests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 6 additions & 11 deletions tests/loadtests/vkloadtests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 9537d57

Please sign in to comment.