Skip to content
Snippets Groups Projects

Updates for openPASS v1.1.0

Merged Raghunandan Netrapalli Madhusudhan requested to merge feature/bmw-sync-20240604_085029 into develop
Files
657
+ 39
8
@@ -297,16 +297,17 @@ function(add_openpass_target)
add_dependencies(${PARSED_ARG_NAME} ${DEP})
# test run dependencies
get_property(DEP_TARGET_TYPE TARGET ${DEP} PROPERTY TYPE)
if("${DEP_TARGET_TYPE}" STREQUAL "INTERFACE_LIBRARY")
message(DEBUG "Dependency is interface libarary. Ignoring.")
continue()
endif()
string(TOUPPER "${CMAKE_BUILD_TYPE}" TYPE)
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_LOCATION)
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_IMPLIB)
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_IMPLIB_${TYPE})
endif()
if("${DEP_PATH}" STREQUAL "")
string(TOUPPER "${CMAKE_BUILD_TYPE}" TYPE)
get_property(DEP_PATH TARGET ${DEP} PROPERTY "IMPORTED_LOCATION_${TYPE}")
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_LOCATION)
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_LOCATION_${TYPE})
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_LOCATION_RELEASE)
@@ -314,6 +315,36 @@ function(add_openpass_target)
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP} PROPERTY IMPORTED_LOCATION_DEBUG)
endif()
if("${DEP_PATH}" STREQUAL "" AND "${DEP}" MATCHES "^Boost::")
message(STATUS "Trying to resolve Boost libraries via Conan")
string(REGEX REPLACE "^Boost::" "" COMP "${DEP}")
set(DEP_ALIAS_TARGET "CONAN_LIB::boost_Boost_${COMP}_boost_${COMP}")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_RELEASE PROPERTY IMPORTED_IMPLIB)
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_RELEASE PROPERTY IMPORTED_IMPLIB_${TYPE})
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_RELEASE PROPERTY IMPORTED_LOCATION)
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_RELEASE PROPERTY IMPORTED_LOCATION_${TYPE})
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_DEBUG PROPERTY IMPORTED_IMPLIB)
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_DEBUG PROPERTY IMPORTED_IMPLIB_${TYPE})
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_DEBUG PROPERTY IMPORTED_LOCATION)
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP_ALIAS_TARGET}_DEBUG PROPERTY IMPORTED_LOCATION_${TYPE})
endif()
message(DEBUG "DEP_PATH: ${DEP_PATH}")
endif()
if("${DEP_PATH}" STREQUAL "")
get_property(DEP_PATH TARGET ${DEP} PROPERTY BINARY_DIR)
Loading