From a23a227b1609dc165334c31a4fa3c3663eb2c608 Mon Sep 17 00:00:00 2001 From: yushan wang Date: Fri, 21 Mar 2025 14:41:46 +0100 Subject: [PATCH 1/4] Update SuperBuild.cmake attempt to address the dyld issue --- cmake/SuperBuild.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake index fa3ead64..1a57cdcd 100644 --- a/cmake/SuperBuild.cmake +++ b/cmake/SuperBuild.cmake @@ -351,10 +351,13 @@ if("${BUILD_TESTING}") "set(ADDPATH [=[${CMAKE_BINARY_DIR}/staging/${CMAKE_INSTALL_LIBDIR}:${CMAKE_BINARY_DIR}/staging/lib]=])\n" [===[ set(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}") +set(DYLD_LIBRARY_PATH "$ENV{DYLD_LIBRARY_PATH}") if("x${LD_LIBRARY_PATH}x" STREQUAL xx) set(ENV{LD_LIBRARY_PATH} "${ADDPATH}") + set(ENV{DYLD_LIBRARY_PATH} "${ADDPATH}") else() set(ENV{LD_LIBRARY_PATH} "${ADDPATH}:${LD_LIBRARY_PATH}") + set(ENV{DYLD_LIBRARY_PATH} "${ADDPATH}:${DYLD_LIBRARY_PATH}") endif() ]===] ) From adf89c986de2da0a165d31a17b87c123bc18952f Mon Sep 17 00:00:00 2001 From: yushan wang Date: Mon, 24 Mar 2025 15:39:54 +0100 Subject: [PATCH 2/4] undo last commit --- cmake/SuperBuild.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake index 1a57cdcd..fa3ead64 100644 --- a/cmake/SuperBuild.cmake +++ b/cmake/SuperBuild.cmake @@ -351,13 +351,10 @@ if("${BUILD_TESTING}") "set(ADDPATH [=[${CMAKE_BINARY_DIR}/staging/${CMAKE_INSTALL_LIBDIR}:${CMAKE_BINARY_DIR}/staging/lib]=])\n" [===[ set(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}") -set(DYLD_LIBRARY_PATH "$ENV{DYLD_LIBRARY_PATH}") if("x${LD_LIBRARY_PATH}x" STREQUAL xx) set(ENV{LD_LIBRARY_PATH} "${ADDPATH}") - set(ENV{DYLD_LIBRARY_PATH} "${ADDPATH}") else() set(ENV{LD_LIBRARY_PATH} "${ADDPATH}:${LD_LIBRARY_PATH}") - set(ENV{DYLD_LIBRARY_PATH} "${ADDPATH}:${DYLD_LIBRARY_PATH}") endif() ]===] ) From 3d96f469e8b6eab1c8a7acf3aae86037c5e95d4f Mon Sep 17 00:00:00 2001 From: yushan wang Date: Mon, 24 Mar 2025 15:41:11 +0100 Subject: [PATCH 3/4] cmake compatibility --- vendor/paraconf-1.0.0/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/paraconf-1.0.0/CMakeLists.txt b/vendor/paraconf-1.0.0/CMakeLists.txt index 6f2f1b60..e362640e 100644 --- a/vendor/paraconf-1.0.0/CMakeLists.txt +++ b/vendor/paraconf-1.0.0/CMakeLists.txt @@ -31,7 +31,7 @@ ### Project header -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(PARACONF_DISTRIB LANGUAGES C CXX) From e8dbe95b0fdd4d02039d1d0bd5e439d50cfb95f9 Mon Sep 17 00:00:00 2001 From: yushan wang Date: Mon, 24 Mar 2025 15:41:20 +0100 Subject: [PATCH 4/4] try to add a paraconf dependency --- pdi/tests/CMakeLists.txt | 52 +++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pdi/tests/CMakeLists.txt b/pdi/tests/CMakeLists.txt index 8da0e008..c558c375 100644 --- a/pdi/tests/CMakeLists.txt +++ b/pdi/tests/CMakeLists.txt @@ -30,6 +30,8 @@ cmake_minimum_required(VERSION 3.16...3.29) find_package(Threads REQUIRED) +find_package(paraconf 1.0.0 REQUIRED COMPONENTS C) + if(NOT TARGET GTest::gtest) option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF) add_subdirectory("../../vendor/googletest-b4aaf97/" "googletest" EXCLUDE_FROM_ALL) @@ -75,35 +77,35 @@ add_executable(PDI_unit_tests PDI_tuple_datatype.cxx ) -set(OPERAND_TYPES uint8_t int64_t float double) -foreach(OPERAND1_TYPE IN LISTS OPERAND_TYPES) - foreach(OPERAND2_TYPE IN LISTS OPERAND_TYPES) - string(REPLACE "_" "U" CASE_NAME "${OPERAND1_TYPE}U${OPERAND2_TYPE}") - configure_file(expression.cxx "${CMAKE_CURRENT_BINARY_DIR}/expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx" @ONLY) - target_sources(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx") - endforeach() -endforeach() +# set(OPERAND_TYPES uint8_t int64_t float double) +# foreach(OPERAND1_TYPE IN LISTS OPERAND_TYPES) +# foreach(OPERAND2_TYPE IN LISTS OPERAND_TYPES) +# string(REPLACE "_" "U" CASE_NAME "${OPERAND1_TYPE}U${OPERAND2_TYPE}") +# configure_file(expression.cxx "${CMAKE_CURRENT_BINARY_DIR}/expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx" @ONLY) +# target_sources(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx") +# endforeach() +# endforeach() -set(PARSEABLE_OPERAND_TYPES long double) -foreach(OPERAND1_TYPE IN LISTS PARSEABLE_OPERAND_TYPES) - foreach(OPERAND2_TYPE IN LISTS PARSEABLE_OPERAND_TYPES) - string(REPLACE "_" "U" CASE_NAME "${OPERAND1_TYPE}U${OPERAND2_TYPE}") - configure_file(parsed_expression.cxx "${CMAKE_CURRENT_BINARY_DIR}/parsed_expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx" @ONLY) - target_sources(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/parsed_expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx") - endforeach() -endforeach() +# set(PARSEABLE_OPERAND_TYPES long double) +# foreach(OPERAND1_TYPE IN LISTS PARSEABLE_OPERAND_TYPES) +# foreach(OPERAND2_TYPE IN LISTS PARSEABLE_OPERAND_TYPES) +# string(REPLACE "_" "U" CASE_NAME "${OPERAND1_TYPE}U${OPERAND2_TYPE}") +# configure_file(parsed_expression.cxx "${CMAKE_CURRENT_BINARY_DIR}/parsed_expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx" @ONLY) +# target_sources(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/parsed_expression_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx") +# endforeach() +# endforeach() -set(MODULABLE_OPERAND_TYPES uint8_t int64_t) -foreach(OPERAND1_TYPE IN LISTS MODULABLE_OPERAND_TYPES) - foreach(OPERAND2_TYPE IN LISTS MODULABLE_OPERAND_TYPES) - string(REPLACE "_" "U" CASE_NAME "${OPERAND1_TYPE}U${OPERAND2_TYPE}") - configure_file(modulo.cxx "${CMAKE_CURRENT_BINARY_DIR}/modulo_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx" @ONLY) - target_sources(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/modulo_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx") - endforeach() -endforeach() +# set(MODULABLE_OPERAND_TYPES uint8_t int64_t) +# foreach(OPERAND1_TYPE IN LISTS MODULABLE_OPERAND_TYPES) +# foreach(OPERAND2_TYPE IN LISTS MODULABLE_OPERAND_TYPES) +# string(REPLACE "_" "U" CASE_NAME "${OPERAND1_TYPE}U${OPERAND2_TYPE}") +# configure_file(modulo.cxx "${CMAKE_CURRENT_BINARY_DIR}/modulo_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx" @ONLY) +# target_sources(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/modulo_${OPERAND1_TYPE}_${OPERAND2_TYPE}.cxx") +# endforeach() +# endforeach() target_compile_features(PDI_unit_tests PRIVATE cxx_std_17) -target_link_libraries(PDI_unit_tests PDI::PDI_plugins Threads::Threads GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main) +target_link_libraries(PDI_unit_tests PDI::PDI_plugins Threads::Threads GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main paraconf::paraconf) target_include_directories(PDI_unit_tests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src") gtest_discover_tests(PDI_unit_tests)