Skip to content
Snippets Groups Projects

Evaluate cross compilation

Compare and
29 files
+ 1904
36
Compare changes
  • Side-by-side
  • Inline
Files
29
+ 7
5
@@ -236,8 +236,10 @@ function(add_openpass_target)
)
add_test(NAME ${PARSED_ARG_NAME}_build COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${PARSED_ARG_NAME})
add_test(NAME ${PARSED_ARG_NAME} COMMAND ${PARSED_ARG_NAME} ${ADDITIONAL_TEST_ARGS})
set_tests_properties(${PARSED_ARG_NAME} PROPERTIES DEPENDS ${PARSED_ARG_NAME}_build)
if((WIN32 AND MSYS) OR UNIX)
add_test(NAME ${PARSED_ARG_NAME} COMMAND ${PARSED_ARG_NAME} ${ADDITIONAL_TEST_ARGS})
set_tests_properties(${PARSED_ARG_NAME} PROPERTIES DEPENDS ${PARSED_ARG_NAME}_build)
endif()
if(WITH_COVERAGE)
add_test_coverage_fastcov(NAME ${PARSED_ARG_NAME})
@@ -399,10 +401,10 @@ function(add_openpass_target)
list(REMOVE_DUPLICATES DEP_PATHS)
message(DEBUG "Collected dependecy paths: ${DEP_PATHS}")
if(WIN32)
if(WIN32 AND MSYS)
# split dependency paths into MSYS and non-MSYS paths
set(MSYS_PATH_REGEX "usr/bin|mingw64/bin|usr\\\\bin|mingw64\\\\bin")
# try to move MSYS system folder to the end of the list
set(DEP_PATHS_NO_MSYS ${DEP_PATHS})
list(FILTER DEP_PATHS_NO_MSYS EXCLUDE REGEX "${MSYS_PATH_REGEX}")
message(DEBUG "Non-MSYS dependency paths: ${DEP_PATHS_NO_MSYS}")
@@ -420,7 +422,7 @@ function(add_openpass_target)
message(DEBUG "Setting test target ENVIRONMENT property to: PATH=${DEP_PATHS}")
set_tests_properties(${PARSED_ARG_NAME} PROPERTIES ENVIRONMENT "PATH=${ADDITIONAL_PATHS}\;${CURRENT_PATH}")
else()
elseif(UNIX)
list(JOIN DEP_PATHS ":" ADDITIONAL_PATHS)
set_tests_properties(${PARSED_ARG_NAME} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${ADDITIONAL_PATHS}:$ENV{LD_LIBRARY_PATH}")
endif()
Loading