From 5f44e2b49e517caddf140cc6558008e5532f1321 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 27 Feb 2023 18:02:58 +0100 Subject: [PATCH] Avoid relying on symlink to share testfiles between connector and cli Symlinks aren't working very well with Git under Windows so better avoid them. --- cli/CMakeLists.txt | 5 ++++- cli/testfiles/testconfig | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 120000 cli/testfiles/testconfig diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index de46484..f1e66a0 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -13,8 +13,11 @@ set(SRC_FILES main.cpp args.cpp application.cpp) set(TEST_HEADER_FILES) set(TEST_SRC_FILES tests/application.cpp) +# use testfiles directory from connector +set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../connector") + # find c++utilities -find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.16.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.21.0 REQUIRED) use_cpp_utilities() # find qtutilities diff --git a/cli/testfiles/testconfig b/cli/testfiles/testconfig deleted file mode 120000 index fbe1030..0000000 --- a/cli/testfiles/testconfig +++ /dev/null @@ -1 +0,0 @@ -../../connector/testfiles/testconfig \ No newline at end of file