mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-23 02:55:15 +00:00
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Manuel Palenzuela <manuelpalenzuelamerino@gmail.com>
|
|
Date: Sun, 4 Apr 2021 00:41:48 +0200
|
|
Subject: [PATCH] Use pkgconfig instead of find_package() to look for
|
|
dependencies
|
|
|
|
---
|
|
CMakeLists.txt | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 616d876..d1aa020 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -18,10 +18,13 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
|
|
endif()
|
|
endif()
|
|
|
|
-find_package(SDL2 REQUIRED)
|
|
-find_package(SDL2_Image REQUIRED)
|
|
-find_package(SDL2_Mixer REQUIRED)
|
|
-include_directories(${SDL2_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR})
|
|
+INCLUDE(FindPkgConfig)
|
|
+
|
|
+PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
|
|
+PKG_SEARCH_MODULE(SDL2IMAGE REQUIRED SDL2_image>=2.0.0)
|
|
+PKG_SEARCH_MODULE(SDL2MIXER REQUIRED SDL2_mixer>=2.0.0)
|
|
+
|
|
+include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIRS})
|
|
|
|
file(COPY src/files DESTINATION .)
|
|
|
|
@@ -30,6 +33,6 @@ include_directories(src)
|
|
file(GLOB_RECURSE uMario_SOURCES "src/*.cpp")
|
|
add_executable (uMario ${uMario_SOURCES})
|
|
|
|
-target_link_libraries(uMario ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${SDL2_MIXER_LIBRARY})
|
|
+target_link_libraries(uMario ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}-lSDL2_mixer -lpthread -lm -lgfx -lgui -lipc -lcore -lcoreminimal)
|
|
|
|
install(TARGETS uMario RUNTIME DESTINATION ${BIN_DIR})
|