ci: Cmake builds would fail if started under a subdir

BlitterStudio · Sep 18, 2024 · 3b0b467 · 3b0b467
1 parent 6ce8923
commit 3b0b467
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 184 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -437,9 +437,9 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR ARCHITECTURE MATCHES "arm32")
     target_compile_definitions(${PROJECT_NAME} PRIVATE CPU_arm ARMV6_ASSEMBLY ARMV6T2 USE_ARMNEON ARM_HAS_DIV)
 endif ()
 
-find_package(SDL2 REQUIRED CONFIG REQUIRED COMPONENTS SDL2)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
+find_package(SDL2 CONFIG REQUIRED COMPONENTS SDL2)
+find_package(SDL2_image CONFIG REQUIRED)
+find_package(SDL2_ttf CONFIG REQUIRED)
 
 if (USE_GPIOD)
     target_compile_definitions(${PROJECT_NAME} PRIVATE USE_GPIOD)
@@ -472,8 +472,8 @@ add_subdirectory(external/libguisan)
 # Add dependencies to ensure external libraries are built
 add_dependencies(${PROJECT_NAME} mt32emu floppybridge capsimage guisan)
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS} src src/osdep src/include src/threaddep src/archivers src/ppc/pearpc external/libguisan/include external/mt32emu/src external/floppybridge/src)
-target_link_libraries(${PROJECT_NAME} PRIVATE SDL2 SDL2_image SDL2_ttf guisan mt32emu ${DBUS_LIBRARIES} FLAC portmidi png mpg123 mpeg2convert mpeg2 serialport z)
+target_include_directories(${PROJECT_NAME} PRIVATE src src/osdep src/include src/threaddep src/archivers src/ppc/pearpc external/libguisan/include external/mt32emu/src external/floppybridge/src)
+target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2 SDL2_image::SDL2_image SDL2_ttf::SDL2_ttf guisan mt32emu ${DBUS_LIBRARIES} FLAC portmidi png mpg123 mpeg2convert mpeg2 serialport z)
 target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-as-needed,-no-pie")
 
 if (USE_OPENGL)
@@ -590,4 +590,4 @@ install(FILES ${CMAKE_BINARY_DIR}/external/capsimage/libcapsimage.so
     DESTINATION share/${PROJECT_NAME}/plugins
 )
 
-include(CPack)
+include(CPack)
diff --git a/cmake/FindSDL2_image.cmake b/cmake/FindSDL2_image.cmake
diff --git a/cmake/FindSDL2_ttf.cmake b/cmake/FindSDL2_ttf.cmake
diff --git a/external/libguisan/CMakeLists.txt b/external/libguisan/CMakeLists.txt
@@ -55,9 +55,8 @@ add_library(guisan STATIC
         src/widgets/textfield.cpp
         src/widgets/togglebutton.cpp
         src/widgets/window.cpp)
-target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS} ./include)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${SDL2IMAGE_LIBRARIES})
+target_include_directories(${PROJECT_NAME} PRIVATE ./include)
+target_link_libraries(${PROJECT_NAME} SDL2::SDL2 SDL2_ttf::SDL2_ttf SDL2_image::SDL2_image)
 
 install(TARGETS ${PROJECT_NAME}
   ARCHIVE DESTINATION lib