[cmake] Use binary output dir for generated field images code (#7772)

wpilibsuite · Feb 10, 2025 · b2584c6 · b2584c6
1 parent 53df127
commit b2584c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -255,3 +255,6 @@ bazel_auth.rc
 
 # ctest
 /Testing/
+
+# Meson
+.meson-subproject*
diff --git a/fieldImages/CMakeLists.txt b/fieldImages/CMakeLists.txt
@@ -36,13 +36,13 @@ endif()
 
 generate_resources(
     src/main/native/resources/edu/wpi/first/fields
-    generated/main/cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/generated/main/cpp
     FIELDS
     fields
     field_images_resources_src
 )
 
-add_library(fieldImages src/main/native/cpp/fields.cpp ${field_images_resources_src})
+add_library(fieldImages ${field_images_resources_src} src/main/native/cpp/fields.cpp)
 set_target_properties(fieldImages PROPERTIES DEBUG_POSTFIX "d")
 
 set_property(TARGET fieldImages PROPERTY FOLDER "libraries")
-Original file line number
+Diff line change
@@ Expand Up / @@ -255,3 +255,6 @@ bazel_auth.rc @@
     # ctest
     /Testing/
+    # Meson
+    .meson-subproject*