From 907ac640967a15d9d422986729b2dae0b29e79bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20M=C3=BCller?= Date: Thu, 14 Mar 2024 12:41:00 +0000 Subject: [PATCH 1/3] fix: Set TEXTPLAN_SOURCE_DIR based on current dir in ploadloader test. That variable was previously computed based on `CMAKE_SOURCE_DIR`, which is the wrong value if `substrait-cpp` is used as a dependency from a different top-level CMake project. The PR applies the pattern based on `CMAKE_CURRENT_SOURCE_DIR` used in other tests. --- export/planloader/tests/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/export/planloader/tests/CMakeLists.txt b/export/planloader/tests/CMakeLists.txt index debc785b..2f4939f0 100644 --- a/export/planloader/tests/CMakeLists.txt +++ b/export/planloader/tests/CMakeLists.txt @@ -15,7 +15,10 @@ add_test_case( gtest gtest_main) -set(TEXTPLAN_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/substrait/textplan") +cmake_path(GET CMAKE_CURRENT_SOURCE_DIR PARENT_PATH TEXTPLAN_SOURCE_DIR) +cmake_path(GET TEXTPLAN_SOURCE_DIR PARENT_PATH TEXTPLAN_SOURCE_DIR) +cmake_path(GET TEXTPLAN_SOURCE_DIR PARENT_PATH TEXTPLAN_SOURCE_DIR) +set(TEXTPLAN_SOURCE_DIR "${TEXTPLAN_SOURCE_DIR}/src/substrait/textplan") add_custom_command( TARGET planloader_test From 1b89f8a098f4aa38365dab58842c92918d04fb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20M=C3=BCller?= Date: Thu, 14 Mar 2024 15:54:19 +0000 Subject: [PATCH 2/3] Use `../` instead of `cmake_path(... PARENT_PATH ...)`. --- export/planloader/tests/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/export/planloader/tests/CMakeLists.txt b/export/planloader/tests/CMakeLists.txt index 2f4939f0..1729e4a7 100644 --- a/export/planloader/tests/CMakeLists.txt +++ b/export/planloader/tests/CMakeLists.txt @@ -15,10 +15,7 @@ add_test_case( gtest gtest_main) -cmake_path(GET CMAKE_CURRENT_SOURCE_DIR PARENT_PATH TEXTPLAN_SOURCE_DIR) -cmake_path(GET TEXTPLAN_SOURCE_DIR PARENT_PATH TEXTPLAN_SOURCE_DIR) -cmake_path(GET TEXTPLAN_SOURCE_DIR PARENT_PATH TEXTPLAN_SOURCE_DIR) -set(TEXTPLAN_SOURCE_DIR "${TEXTPLAN_SOURCE_DIR}/src/substrait/textplan") +set(TEXTPLAN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/substrait/textplan") add_custom_command( TARGET planloader_test From a06c17b564019c80ea8f9eb0ceb15c429b5cf526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20M=C3=BCller?= Date: Thu, 14 Mar 2024 19:06:13 +0000 Subject: [PATCH 3/3] Fix formatting of CMake file. --- export/planloader/tests/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/export/planloader/tests/CMakeLists.txt b/export/planloader/tests/CMakeLists.txt index 1729e4a7..4115612b 100644 --- a/export/planloader/tests/CMakeLists.txt +++ b/export/planloader/tests/CMakeLists.txt @@ -15,7 +15,8 @@ add_test_case( gtest gtest_main) -set(TEXTPLAN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/substrait/textplan") +set(TEXTPLAN_SOURCE_DIR + "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/substrait/textplan") add_custom_command( TARGET planloader_test