From 89a608e35f0e7406ef4fb72fa688626303e5337a Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 21 Sep 2020 09:13:47 +0300 Subject: [PATCH] Rename imported target sdl2 -> SDL2 & use it instead of legacy CMake variables --- cmake/modules/FindSDL2.cmake | 6 +++--- libs/sdl2/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake index b486eb43..412acd31 100644 --- a/cmake/modules/FindSDL2.cmake +++ b/cmake/modules/FindSDL2.cmake @@ -8,9 +8,9 @@ find_library(SDL2_LIBRARIES NAMES "SDL2" PATHS "${SDL2_ROOT}/lib") include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL2 DEFAULT_MSG SDL2_INCLUDE_DIRS SDL2_LIBRARIES) -if(SDL2_FOUND AND NOT TARGET sdl2) - add_library(sdl2 SHARED IMPORTED) - set_target_properties(sdl2 PROPERTIES +if(SDL2_FOUND AND NOT TARGET SDL2) + add_library(SDL2 SHARED IMPORTED) + set_target_properties(SDL2 PROPERTIES IMPORTED_LOCATION "${SDL2_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" ) diff --git a/libs/sdl2/CMakeLists.txt b/libs/sdl2/CMakeLists.txt index cfee727d..65d01bf3 100644 --- a/libs/sdl2/CMakeLists.txt +++ b/libs/sdl2/CMakeLists.txt @@ -4,5 +4,5 @@ file(GLOB_RECURSE PSEMEK_SDL2_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "in file(GLOB_RECURSE PSEMEK_SDL2_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") add_library(psemek-sdl2 ${PSEMEK_SDL2_HEADERS} ${PSEMEK_SDL2_SOURCES}) -target_include_directories(psemek-sdl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${SDL2_INCLUDE_DIRS}") -target_link_libraries(psemek-sdl2 PUBLIC ${SDL2_LIBRARIES}) +target_include_directories(psemek-sdl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-sdl2 PUBLIC SDL2)