ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-22 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update CMakeLists

Browse Source
This commit is contained in:
Cong
2025-04-16 12:36:28 +10:00
parent 046c30fe1f
commit d49448bae6
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -69,7 +69,6 @@ set(CMAKE_MODULE_PATH
find_package(Nanopb 0.4.5...<1.0.0 REQUIRED) find_package(Nanopb 0.4.5...<1.0.0 REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
message("SDL2 include dir: ${SDL2_INCLUDE_DIRS}") message("SDL2 include dir: ${SDL2_INCLUDE_DIRS}")
find_package(SDL2_image REQUIRED)
find_package(SDL2_mixer REQUIRED) find_package(SDL2_mixer REQUIRED)
if(BUILD_EDITOR) if(BUILD_EDITOR)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
@@ -291,7 +290,7 @@ elseif(APPLE)
# copy SDL frameworks # copy SDL frameworks
set(APPS cdogs-sdl cdogs-sdl-editor) set(APPS cdogs-sdl cdogs-sdl-editor)
set(LIBS SDL2 SDL2_image SDL2_mixer) set(LIBS SDL2 SDL2_mixer)
foreach(APP ${APPS}) foreach(APP ${APPS})
foreach(LIB ${LIBS}) foreach(LIB ${LIBS})
install(DIRECTORY /Library/Frameworks/${LIB}.framework install(DIRECTORY /Library/Frameworks/${LIB}.framework

1
src/cdogs/CMakeLists.txt
View File

@@ -250,6 +250,5 @@ target_link_libraries(cdogs
SDL_joystickbuttonnames SDL_joystickbuttonnames
yajl_s yajl_s
SDL2::SDL2 SDL2::SDL2
SDL2_image::SDL2_image
SDL2_mixer::SDL2_mixer SDL2_mixer::SDL2_mixer
${ENet_LIBRARIES}) ${ENet_LIBRARIES})

2
src/cdogsed/CMakeLists.txt
View File

@@ -46,4 +46,4 @@ set(CDOGSED_HEADERS
tile_brush.h tile_brush.h
ui_object.h) ui_object.h)
add_library(cdogsedlib STATIC ${CDOGSED_SOURCES} ${CDOGSED_HEADERS}) add_library(cdogsedlib STATIC ${CDOGSED_SOURCES} ${CDOGSED_HEADERS})
target_link_libraries(cdogsedlib SDL2::SDL2 SDL2_image::SDL2_image SDL2_mixer::SDL2_mixer) target_link_libraries(cdogsedlib SDL2::SDL2 SDL2_mixer::SDL2_mixer)

1
src/tests/CMakeLists.txt
View File

@@ -140,7 +140,6 @@ target_link_libraries(pic_test
cdogs cdogs
cdogs_proto cdogs_proto
SDL2::SDL2 SDL2::SDL2
SDL2_image::SDL2_image
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
# TODO: test disabled since CI fails with Couldn't find matching render driver # TODO: test disabled since CI fails with Couldn't find matching render driver
#add_test(NAME pic_test COMMAND pic_test) #add_test(NAME pic_test COMMAND pic_test)