Compare commits

...

1 Commits

Author SHA1 Message Date
FARHANG c77c9186d6 Hacky fixes for macOS build 2026-01-29 18:25:41 -05:00
4 changed files with 12 additions and 3 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ function(px4_add_common_flags)
-Warray-bounds
-Wcast-align
-Wdisabled-optimization
-Wdouble-promotion
# -Wdouble-promotion
-Wfatal-errors
-Wfloat-equal
-Wformat-security
@@ -45,6 +45,11 @@ else()
GstCameraSystem.cpp
)
target_link_directories(${PROJECT_NAME}
PUBLIC ${GSTREAMER_LIBRARY_DIRS}
PUBLIC ${GSTREAMER_APP_LIBRARY_DIRS}
)
target_link_libraries(${PROJECT_NAME}
PUBLIC px4_gz_msgs
PUBLIC ${GZ_SENSORS_TARGET}
@@ -53,6 +53,10 @@ target_link_libraries(${PROJECT_NAME}
PUBLIC ${OpenCV_LIBS}
PUBLIC ${OpticalFlow_LIBS}
)
set_target_properties(${PROJECT_NAME} PROPERTIES
BUILD_RPATH "${CMAKE_BINARY_DIR}/OpticalFlow/install/lib"
INSTALL_RPATH "${CMAKE_BINARY_DIR}/OpticalFlow/install/lib"
)
target_include_directories(${PROJECT_NAME}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
@@ -43,12 +43,12 @@ if(NOT TARGET OpticalFlow)
PREFIX ${CMAKE_BINARY_DIR}/OpticalFlow
INSTALL_DIR ${OPTICAL_FLOW_INSTALL_PREFIX}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${OPTICAL_FLOW_INSTALL_PREFIX}
BUILD_BYPRODUCTS ${OPTICAL_FLOW_INSTALL_PREFIX}/lib/libOpticalFlow.so
BUILD_BYPRODUCTS ${OPTICAL_FLOW_INSTALL_PREFIX}/lib/libOpticalFlow${CMAKE_SHARED_LIBRARY_SUFFIX}
UPDATE_DISCONNECTED ON
BUILD_ALWAYS OFF
STEP_TARGETS build
)
set(OpticalFlow_INCLUDE_DIRS ${OPTICAL_FLOW_INSTALL_PREFIX}/include CACHE INTERNAL "")
set(OpticalFlow_LIBS ${OPTICAL_FLOW_INSTALL_PREFIX}/lib/libOpticalFlow.so CACHE INTERNAL "")
set(OpticalFlow_LIBS ${OPTICAL_FLOW_INSTALL_PREFIX}/lib/libOpticalFlow${CMAKE_SHARED_LIBRARY_SUFFIX} CACHE INTERNAL "")
endif()