Remove target to launch tests with wine
This wasn't of much use. One can just use `make check` and set WINEPATH before manually.
This commit is contained in:
parent
7c4cd6ee7d
commit
c66420b1dc
|
@ -340,18 +340,6 @@ if(CPP_UNIT_LIB OR META_NO_CPP_UNIT)
|
|||
add_dependencies(check ${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tests)
|
||||
endif()
|
||||
|
||||
# add target for launching tests with wine ensuring the WINEPATH is set correctly so wine is able to find all required *.dll files
|
||||
# requires script from c++utilities, hence the sources of c++utilities must be present
|
||||
if(MINGW AND CMAKE_CROSSCOMPILING AND CPP_UTILITIES_SOURCE_DIR)
|
||||
if(NOT TARGET ${META_PROJECT_NAME}_run_tests_with_wine)
|
||||
if(CMAKE_FIND_ROOT_PATH)
|
||||
list(APPEND RUNTIME_LIBRARY_PATH "${CMAKE_FIND_ROOT_PATH}/bin")
|
||||
endif()
|
||||
add_custom_target(${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_run_tests_with_wine COMMAND "${CPP_UTILITIES_SOURCE_DIR}/scripts/wine.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tests.${WINDOWS_EXT}" ${RUNTIME_LIBRARY_PATH})
|
||||
add_dependencies(${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_run_tests_with_wine ${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tests)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(META_HAVE_TESTS YES)
|
||||
|
||||
else()
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/bash
|
||||
if [[ $# -lt 1 ]]; then
|
||||
echo "Starts the specified executable with wine."
|
||||
echo "Usage: $0 executable [additional_dll_path(s)]"
|
||||
exit -1
|
||||
fi
|
||||
for arg in "${@:2}"; do
|
||||
WINEPATH="${arg};${WINEPATH}"
|
||||
done
|
||||
export WINEPATH;
|
||||
wine "${@:1:1}"
|
Loading…
Reference in New Issue