Added includes to allow for libraries to be linked to out-of-tree

pimoroni · Aug 31, 2023 · 8a9ef39 · 8a9ef39
1 parent 57042bf
commit 8a9ef39
Show file tree

Hide file tree

Showing 43 changed files with 326 additions and 52 deletions.
diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
@@ -41,6 +41,6 @@ add_subdirectory(pms5003)
 add_subdirectory(sh1107)
 add_subdirectory(st7567)
 add_subdirectory(psram_display)
-add_subdirectory(inky73)
 add_subdirectory(shiftregister)
+add_subdirectory(inky73)
 add_subdirectory(mlx90640)
diff --git a/drivers/inky73/inky73.cmake b/drivers/inky73/inky73.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET shiftregister)
+  include(${CMAKE_CURRENT_LIST_DIR}/../shiftregister/shiftregister.cmake)
+endif()
+
 set(DRIVER_NAME inky73)
 add_library(${DRIVER_NAME} INTERFACE)
 

diff --git a/drivers/motor/motor.cmake b/drivers/motor/motor.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pwm)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm.cmake)
+endif()
+
 set(DRIVER_NAME motor)
 add_library(${DRIVER_NAME} INTERFACE)
 

diff --git a/drivers/motor/motor_cluster.cmake b/drivers/motor/motor_cluster.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pwm_cluster)
+    include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm_cluster.cmake)
+endif()
+
 set(DRIVER_NAME motor_cluster)
 add_library(${DRIVER_NAME} INTERFACE)
 

diff --git a/drivers/rgbled/rgbled.cmake b/drivers/rgbled/rgbled.cmake
@@ -7,4 +7,4 @@ target_sources(rgbled INTERFACE
 target_include_directories(rgbled INTERFACE ${CMAKE_CURRENT_LIST_DIR})
 
 # Pull in pico libraries that we need
-target_link_libraries(rgbled INTERFACE pico_stdlib hardware_pwm)
+target_link_libraries(rgbled INTERFACE pico_stdlib hardware_pwm)
diff --git a/drivers/servo/servo.cmake b/drivers/servo/servo.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pwm)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm.cmake)
+endif()
+
 set(DRIVER_NAME servo)
 add_library(${DRIVER_NAME} INTERFACE)
 

diff --git a/drivers/servo/servo_cluster.cmake b/drivers/servo/servo_cluster.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pwm_cluster)
+    include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm_cluster.cmake)
+endif()
+
 set(DRIVER_NAME servo_cluster)
 add_library(${DRIVER_NAME} INTERFACE)
 

diff --git a/libraries/automation2040w/automation.cmake b/libraries/automation2040w/automation.cmake
@@ -1,12 +1,14 @@
-add_library(automation INTERFACE)
-
-target_sources(automation INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/automation.cpp
-)
-
-target_include_directories(automation INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-#include(${PIMORONI_PICO_PATH}/drivers/analog/analog.cmake)
-
-# Pull in pico libraries that we need
-target_link_libraries(automation INTERFACE pico_stdlib hardware_pwm hardware_i2c pimoroni_i2c analog)
+if(NOT TARGET analog)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/analog/analog.cmake)
+endif()
+
+add_library(automation INTERFACE)
+
+target_sources(automation INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/automation.cpp
+)
+
+target_include_directories(automation INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(automation INTERFACE pico_stdlib hardware_pwm hardware_i2c pimoroni_i2c analog)
diff --git a/libraries/badger2040/badger2040.cmake b/libraries/badger2040/badger2040.cmake
@@ -1,11 +1,23 @@
-set(LIB_NAME badger2040)
-add_library(${LIB_NAME} INTERFACE)
-
-target_sources(${LIB_NAME} INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
-)
-
-target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Pull in pico libraries that we need
-target_link_libraries(${LIB_NAME} INTERFACE bitmap_fonts hershey_fonts pico_stdlib hardware_pwm uc8151_legacy)
+if(NOT TARGET uc8151_legacy)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/uc8151_legacy/uc8151_legacy.cmake)
+endif()
+
+if(NOT TARGET bitmap_fonts)
+  include(${CMAKE_CURRENT_LIST_DIR}/../bitmap_fonts/bitmap_fonts.cmake)
+endif()
+
+if(NOT TARGET hershey_fonts)
+  include(${CMAKE_CURRENT_LIST_DIR}/../hershey_fonts/hershey_fonts.cmake)
+endif()
+
+set(LIB_NAME badger2040)
+add_library(${LIB_NAME} INTERFACE)
+
+target_sources(${LIB_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
+)
+
+target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${LIB_NAME} INTERFACE bitmap_fonts hershey_fonts uc8151_legacy pico_stdlib hardware_pwm)
diff --git a/libraries/breakout_as7262/breakout_as7262.cmake b/libraries/breakout_as7262/breakout_as7262.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET as7262)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/as7262/as7262.cmake)
+endif()
+
 set(LIB_NAME breakout_as7262)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_bh1745/breakout_bh1745.cmake b/libraries/breakout_bh1745/breakout_bh1745.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET bh1745)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/bh1745/bh1745.cmake)
+endif()
+
 set(LIB_NAME breakout_bh1745)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_dotmatrix/breakout_dotmatrix.cmake b/libraries/breakout_dotmatrix/breakout_dotmatrix.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET ltp305)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ltp305/ltp305.cmake)
+endif()
+
 set(LIB_NAME breakout_dotmatrix)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_encoder/breakout_encoder.cmake b/libraries/breakout_encoder/breakout_encoder.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_encoder)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_encoder_wheel/breakout_encoder_wheel.cmake b/libraries/breakout_encoder_wheel/breakout_encoder_wheel.cmake
@@ -1,3 +1,11 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
+if(NOT TARGET is31fl3731)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/is31fl3731/is31fl3731.cmake)
+endif()
+
 set(LIB_NAME breakout_encoder_wheel)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_ioexpander/breakout_ioexpander.cmake b/libraries/breakout_ioexpander/breakout_ioexpander.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_ioexpander)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_ltr559/breakout_ltr559.cmake b/libraries/breakout_ltr559/breakout_ltr559.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET ltr559)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ltr559/ltr559.cmake)
+endif()
+
 set(LIB_NAME breakout_ltr559)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_matrix11x7/breakout_matrix11x7.cmake b/libraries/breakout_matrix11x7/breakout_matrix11x7.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET is31fl3731)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/is31fl3731/is31fl3731.cmake)
+endif()
+
 set(LIB_NAME breakout_matrix11x7)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_mics6814/breakout_mics6814.cmake b/libraries/breakout_mics6814/breakout_mics6814.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_mics6814)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_msa301/breakout_msa301.cmake b/libraries/breakout_msa301/breakout_msa301.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET msa301)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/msa301/msa301.cmake)
+endif()
+
 set(LIB_NAME breakout_msa301)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_paa5100/breakout_paa5100.cmake b/libraries/breakout_paa5100/breakout_paa5100.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pmw3901)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pmw3901/pmw3901.cmake)
+endif()
+
 set(LIB_NAME breakout_paa5100)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_pmw3901/breakout_pmw3901.cmake b/libraries/breakout_pmw3901/breakout_pmw3901.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pmw3901)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pmw3901/pmw3901.cmake)
+endif()
+
 set(LIB_NAME breakout_pmw3901)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_potentiometer/breakout_potentiometer.cmake b/libraries/breakout_potentiometer/breakout_potentiometer.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_potentiometer)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cmake b/libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET is31fl3731)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/is31fl3731/is31fl3731.cmake)
+endif()
+
 set(LIB_NAME breakout_rgbmatrix5x5)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_rtc/breakout_rtc.cmake b/libraries/breakout_rtc/breakout_rtc.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET rv3028)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/rv3028/rv3028.cmake)
+endif()
+
 set(LIB_NAME breakout_rtc)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_sgp30/breakout_sgp30.cmake b/libraries/breakout_sgp30/breakout_sgp30.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET sgp30)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/sgp30/sgp30.cmake)
+endif()
+
 set(LIB_NAME breakout_sgp30)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/breakout_trackball/breakout_trackball.cmake b/libraries/breakout_trackball/breakout_trackball.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET trackball)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/trackball/trackball.cmake)
+endif()
+
 set(LIB_NAME breakout_trackball)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/cosmic_unicorn/cosmic_unicorn.cmake b/libraries/cosmic_unicorn/cosmic_unicorn.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 add_library(cosmic_unicorn INTERFACE)
 
 pico_generate_pio_header(cosmic_unicorn ${CMAKE_CURRENT_LIST_DIR}/cosmic_unicorn.pio)

diff --git a/libraries/galactic_unicorn/galactic_unicorn.cmake b/libraries/galactic_unicorn/galactic_unicorn.cmake
@@ -1,3 +1,7 @@
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 add_library(galactic_unicorn INTERFACE)
 
 pico_generate_pio_header(galactic_unicorn ${CMAKE_CURRENT_LIST_DIR}/galactic_unicorn.pio)

diff --git a/libraries/gfx_pack/gfx_pack.cmake b/libraries/gfx_pack/gfx_pack.cmake
@@ -1,3 +1,19 @@
+if(NOT TARGET st7567)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/st7567/st7567.cmake)
+endif()
+
+if(NOT TARGET button)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/button/button.cmake)
+endif()
+
+if(NOT TARGET rgbled)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/rgbled/rgbled.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 set(LIB_NAME gfx_pack)
 add_library(${LIB_NAME} INTERFACE)
 

diff --git a/libraries/inky_frame/inky_frame.cmake b/libraries/inky_frame/inky_frame.cmake
@@ -1,11 +1,35 @@
-set(LIB_NAME inky_frame)
-add_library(${LIB_NAME} INTERFACE)
-
-target_sources(${LIB_NAME} INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
-)
-
-target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Pull in pico libraries that we need
-target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a uc8159 jpegdec)
+if(NOT TARGET sdcard)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/sdcard/sdcard.cmake)
+endif()
+
+if(NOT TARGET fatfs)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/fatfs/fatfs.cmake)
+endif()
+
+if(NOT TARGET pcf85063a)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pcf85063a/pcf85063a.cmake)
+endif()
+
+if(NOT TARGET uc8159)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/uc8159/uc8159.cmake)
+endif()
+
+if(NOT TARGET jpegdec)
+  include(${CMAKE_CURRENT_LIST_DIR}/../jpegdec/jpegdec.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
+set(LIB_NAME inky_frame)
+add_library(${LIB_NAME} INTERFACE)
+
+target_sources(${LIB_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
+)
+
+target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a uc8159 jpegdec)
diff --git a/libraries/inky_frame_7/inky_frame_7.cmake b/libraries/inky_frame_7/inky_frame_7.cmake
@@ -1,13 +1,41 @@
-set(LIB_NAME inky_frame_7)
-add_library(${LIB_NAME} INTERFACE)
-
-target_sources(${LIB_NAME} INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
-)
-
-target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Pull in pico libraries that we need
-target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a psram_display inky73 jpegdec)
-
+if(NOT TARGET sdcard)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/sdcard/sdcard.cmake)
+endif()
+
+if(NOT TARGET fatfs)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/fatfs/fatfs.cmake)
+endif()
+
+if(NOT TARGET pcf85063a)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pcf85063a/pcf85063a.cmake)
+endif()
+
+if(NOT TARGET psram_display)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/psram_display/psram_display.cmake)
+endif()
+
+if(NOT TARGET inky73)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/inky73/inky73.cmake)
+endif()
+
+if(NOT TARGET jpegdec)
+  include(${CMAKE_CURRENT_LIST_DIR}/../jpegdec/jpegdec.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
+set(LIB_NAME inky_frame_7)
+add_library(${LIB_NAME} INTERFACE)
+
+target_sources(${LIB_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
+)
+
+target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a psram_display inky73 jpegdec)
+
 target_compile_options(${LIB_NAME} INTERFACE -Wno-error=reorder)