Skip to content

Commit

Permalink
CMake: Use player_find_package at more places to improve diagnostics
Browse files Browse the repository at this point in the history
  • Loading branch information
Ghabry committed Jan 3, 2023
1 parent 3b8801a commit 8e1ead9
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -562,8 +562,7 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL1")
src/platform/sdl/sdl_ui.h)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=1)

find_package(SDL1 REQUIRED)
target_link_libraries(${PROJECT_NAME} SDL::SDLmain)
player_find_package(NAME SDL1 TARGET SDL::SDLmain REQUIRED)
elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "libretro")
target_compile_definitions(${PROJECT_NAME} PUBLIC PLAYER_UI=LibretroUi USE_LIBRETRO=1)
set(PLAYER_BUILD_EXECUTABLE OFF)
Expand Down Expand Up @@ -799,14 +798,9 @@ else()
endif()

# Detect all required libraries
find_package(PNG REQUIRED)
target_link_libraries(${PROJECT_NAME} PNG::PNG)

find_package(Pixman REQUIRED)
target_link_libraries(${PROJECT_NAME} PIXMAN::PIXMAN)

find_package(fmt REQUIRED)
target_link_libraries(${PROJECT_NAME} fmt::fmt)
player_find_package(NAME PNG TARGET PNG::PNG REQUIRED)
player_find_package(NAME Pixman TARGET PIXMAN::PIXMAN REQUIRED)
player_find_package(NAME fmt TARGET fmt::fmt REQUIRED)

# Always enable Wine registry support on non-Windows, but not for console ports
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT ${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$")
Expand Down Expand Up @@ -1368,8 +1362,7 @@ set_property(CACHE PLAYER_ENABLE_INSTRUMENTATION PROPERTY STRINGS OFF VTune)
if (NOT ${PLAYER_ENABLE_INSTRUMENTATION} STREQUAL "OFF")
target_compile_definitions(${PROJECT_NAME} PUBLIC PLAYER_INSTRUMENTATION=${PLAYER_ENABLE_INSTRUMENTATION})
if (${PLAYER_ENABLE_INSTRUMENTATION} STREQUAL "VTune")
find_package(VTune REQUIRED)
target_link_libraries(${PROJECT_NAME} VTune::ITT)
player_find_package(NAME VTune TARGET VTune::ITT REQUIRED)
endif()
endif()

Expand Down

0 comments on commit 8e1ead9

Please sign in to comment.