diff --git a/.gitignore b/.gitignore index 3cf9f62103..0d50414a43 100644 --- 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 index 93f8e13695..f1d435c30e 100644 --- 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")