From 999533f95c47fba88e99e5c26294d637d74c4761 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 09:45:06 +0100 Subject: [PATCH 01/15] use the open62541 1.4.6 --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index 3744d3e..7ed3bc6 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -5,7 +5,7 @@ cmake_paths [requires] libxml2/2.9.9 libcheck/0.15.2 -open62541/1.3.1 +open62541/1.4.6 [options] libxml2*:shared=False From b8a5d89c3168ce7d1ccbbc0339a0bff41ac98643 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 09:54:36 +0100 Subject: [PATCH 02/15] try with conan 2 --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2fa66cd..d733d1d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Install conan - run: pip install conan==1.59.0 + run: pip install conan - uses: actions/checkout@v4 with: From 683fe2e161f92b3dfde321000c3a353fd40e001b Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 09:57:05 +0100 Subject: [PATCH 03/15] conan profile detect --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d733d1d..b229de8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,8 +26,8 @@ jobs: steps: - name: Install conan - run: pip install conan - + run: pip install conan && conan profile detect + - uses: actions/checkout@v4 with: path: ./nodesetLoader From 7fc041d2cab56049536df118378c08db30f82709 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 10:15:31 +0100 Subject: [PATCH 04/15] cmake_conan develop2 --- .github/workflows/windows.yml | 6 +++--- .gitmodules | 3 +++ CMakeLists.txt | 16 ---------------- cmake-conan | 1 + 4 files changed, 7 insertions(+), 19 deletions(-) create mode 160000 cmake-conan diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b229de8..89c3872 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,8 +26,8 @@ jobs: steps: - name: Install conan - run: pip install conan && conan profile detect - + run: pip install conan && conan profile detect && conan profile update settings.compiler. + - uses: actions/checkout@v4 with: path: ./nodesetLoader @@ -35,7 +35,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: Build nodesetLoader run: | - cd ./nodesetLoader && cmake -DCMAKE_BUILD_TYPE=Release ` + cd ./nodesetLoader && cmake -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake -DCMAKE_BUILD_TYPE=Release ` -DENABLE_TESTING=ON ` -DENABLE_CONAN=ON . && ` cmake --build . diff --git a/.gitmodules b/.gitmodules index e69de29..bac4e7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cmake-conan"] + path = cmake-conan + url = git@github.com:conan-io/cmake-conan.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b2d54e6..615a38d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,22 +38,6 @@ if(${ENABLE_BUILD_INTO_OPEN62541}) set(ENABLE_BACKEND_STDOUT off) endif() -if(${ENABLE_CONAN}) - if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") - message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake" - "${CMAKE_BINARY_DIR}/conan.cmake") - endif() - - include(${CMAKE_BINARY_DIR}/conan.cmake) - conan_cmake_run(CONANFILE conanfile.txt - BASIC_SETUP - CMAKE_TARGETS - BUILD missing) - - include(${CMAKE_BINARY_DIR}/conan_paths.cmake) -endif() - # LibXML2 is always required find_package(LibXml2 REQUIRED QUIET) diff --git a/cmake-conan b/cmake-conan new file mode 160000 index 0000000..c22bbf0 --- /dev/null +++ b/cmake-conan @@ -0,0 +1 @@ +Subproject commit c22bbf0af0b73d5f0def24a9cdf4ce503ae79e5d From 773d8ded753f12ae7c1061055066d23b92efce94 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 10:17:37 +0100 Subject: [PATCH 05/15] conan profile detect --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 89c3872..d228740 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Install conan - run: pip install conan && conan profile detect && conan profile update settings.compiler. + run: pip install conan && conan profile detect - uses: actions/checkout@v4 with: From f82a13826bcac8d7ed5c6e23f383ea1a9060da32 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 10:21:05 +0100 Subject: [PATCH 06/15] checkout submodules --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d228740..42e3169 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,6 +30,7 @@ jobs: - uses: actions/checkout@v4 with: + submodules: recursive path: ./nodesetLoader - uses: ilammy/msvc-dev-cmd@v1 From 76e4455f1fbccd57be9642b502b2fe1369edad9c Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 10:24:25 +0100 Subject: [PATCH 07/15] path --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 42e3169..838dad2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,7 +36,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: Build nodesetLoader run: | - cd ./nodesetLoader && cmake -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake -DCMAKE_BUILD_TYPE=Release ` + cd ./nodesetLoader && cmake "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake" -DCMAKE_BUILD_TYPE=Release ` -DENABLE_TESTING=ON ` -DENABLE_CONAN=ON . && ` cmake --build . From b75c02eab49253f3a6d961d88504d5c5378002d7 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 10:29:15 +0100 Subject: [PATCH 08/15] generator --- conanfile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index 7ed3bc6..4ae77b4 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,6 +1,6 @@ [generators] -cmake_find_package -cmake_paths +CMakeDeps +CMakeToolchain [requires] libxml2/2.9.9 From 7634ae7a8a47d2fb0cfb5e17fce883ff40d8f1b6 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 10:39:13 +0100 Subject: [PATCH 09/15] iconv --- conanfile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.txt b/conanfile.txt index 4ae77b4..db54c25 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -9,6 +9,7 @@ open62541/1.4.6 [options] libxml2*:shared=False +libxml2*:iconv=False libcheck*:with_subunit=False From 9a12d42bb331553f6b1733ab14174fb9bce23c91 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 11:14:36 +0100 Subject: [PATCH 10/15] Check::check target --- tests/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ede4cee..a1d244e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(sort sort.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/Sort.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/nodes/InstanceNode.c) target_include_directories(sort PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_SOURCE_DIR}/../include) -target_link_libraries(sort PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(sort PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME sort_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND sort ${CMAKE_CURRENT_LIST_DIR}) add_executable(nodeContainer @@ -13,21 +13,21 @@ add_executable(nodeContainer ${CMAKE_CURRENT_SOURCE_DIR}/../src/Value.c ) target_include_directories(nodeContainer PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../src) -target_link_libraries(nodeContainer PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(nodeContainer PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME nodeContainer_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND nodeContainer ${CMAKE_CURRENT_LIST_DIR}) add_executable(value ValueTest.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/Value.c) target_include_directories(value PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include) -target_link_libraries(value PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(value PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME value_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND value ${CMAKE_CURRENT_LIST_DIR}) add_executable(allocator allocator.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/CharAllocator.c) target_include_directories(allocator PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../src) -target_link_libraries(allocator PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(allocator PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME allocatorTest WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND allocator ${CMAKE_CURRENT_LIST_DIR}) add_executable(parser parser.c) -target_link_libraries(parser PRIVATE NodesetLoader ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(parser PRIVATE NodesetLoader Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) target_include_directories(parser PRIVATE ${CHECK_INCLUDE_DIR}) add_test(NAME parser_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} From 02f3dcfe54b53490c3663a16a56b0e264e099497 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 11:25:35 +0100 Subject: [PATCH 11/15] Check::check --- backends/open62541/tests/CMakeLists.txt | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/backends/open62541/tests/CMakeLists.txt b/backends/open62541/tests/CMakeLists.txt index dc917a7..b4a5740 100644 --- a/backends/open62541/tests/CMakeLists.txt +++ b/backends/open62541/tests/CMakeLists.txt @@ -1,90 +1,90 @@ add_executable(import import.c) target_include_directories(import PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(import PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(import PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME import_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND import ${PROJECT_SOURCE_DIR}/nodesets/testNodeset100nodes.xml) add_executable(namespaceZeroValues namespaceZeroValues.c) target_include_directories(namespaceZeroValues PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(namespaceZeroValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(namespaceZeroValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME namespaceZeroValues_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND namespaceZeroValues ${CMAKE_CURRENT_SOURCE_DIR}/namespaceZeroValues.xml) add_executable(customTypesWithValues customTypesWithValues.c) target_include_directories(customTypesWithValues PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(customTypesWithValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(customTypesWithValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME customTypesWithValues_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND customTypesWithValues ${CMAKE_CURRENT_SOURCE_DIR}/customTypesWithValues.xml) add_executable(subDataTypes subDataTypes.c) target_include_directories(subDataTypes PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(subDataTypes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(subDataTypes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME subDataTypes_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND subDataTypes ${CMAKE_CURRENT_SOURCE_DIR}/subDataTypes.xml) add_executable(valueRank valueRank.c) target_include_directories(valueRank PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(valueRank PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(valueRank PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME valueRank_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND valueRank ${CMAKE_CURRENT_SOURCE_DIR}/valueRank.xml) add_executable(basicNodeClasses basicNodeClasses.c) target_include_directories(basicNodeClasses PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(basicNodeClasses PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(basicNodeClasses PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME basicNodeClasses_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND basicNodeClasses ${CMAKE_CURRENT_SOURCE_DIR}/basicNodeClasses.xml) add_executable(issue_201 issue_201.c) target_include_directories(issue_201 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_201 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(issue_201 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME issue_201_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_201 ${CMAKE_CURRENT_SOURCE_DIR}/issue_201.xml) add_executable(issue_241 issue_241.c) target_include_directories(issue_241 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_241 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(issue_241 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME issue_241_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_241 ${CMAKE_CURRENT_SOURCE_DIR}/issue_241.xml) add_executable(stringNodeId_issue_224 stringNodeId_issue_224.c) target_include_directories(stringNodeId_issue_224 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(stringNodeId_issue_224 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(stringNodeId_issue_224 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME stringNodeId_issue_224 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND stringNodeId_issue_224 ${CMAKE_CURRENT_SOURCE_DIR}/stringNodeId_issue_224.xml) add_executable(orderingStringNodeIds orderingStringNodeIds.c) target_include_directories(orderingStringNodeIds PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(orderingStringNodeIds PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(orderingStringNodeIds PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME orderingStringNodeIds WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND orderingStringNodeIds ${CMAKE_CURRENT_SOURCE_DIR}/orderingStringNodeIds.xml) add_executable(cornerCases cornerCases.c) target_include_directories(cornerCases PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(cornerCases PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(cornerCases PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME cornerCases_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND cornerCases ${CMAKE_CURRENT_SOURCE_DIR}/cornerCases.xml) add_executable(extension extension.c) target_include_directories(extension PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(extension PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(extension PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME extension_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND extension ${CMAKE_CURRENT_SOURCE_DIR}/extension.xml) add_executable(newHierachicalRef newHierachicalRef.c) target_include_directories(newHierachicalRef PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(newHierachicalRef PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(newHierachicalRef PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME newHierachicalRef_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND newHierachicalRef ${CMAKE_CURRENT_SOURCE_DIR}/newHierachicalRef.xml @@ -92,70 +92,70 @@ add_test(NAME newHierachicalRef_Test add_executable(references references.c) target_include_directories(references PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(references PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(references PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME references_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND references ${CMAKE_CURRENT_SOURCE_DIR}/references.xml) add_executable(multipleNamespaces multipleNamespaces.c) target_include_directories(multipleNamespaces PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(multipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(multipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME multipleNamespaces_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND multipleNamespaces ${CMAKE_CURRENT_SOURCE_DIR}/multipleNamespaces.xml) add_executable(structMultipleNamespaces structMultipleNamespaces.c) target_include_directories(structMultipleNamespaces PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(structMultipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(structMultipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME structMultipleNamespaces_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND structMultipleNamespaces ${CMAKE_CURRENT_SOURCE_DIR}/basestruct.xml ${CMAKE_CURRENT_SOURCE_DIR}/extendedstruct.xml) add_executable(structwitharray structwitharray.c) target_include_directories(structwitharray PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(structwitharray PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(structwitharray PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME structwitharray_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND structwitharray ${CMAKE_CURRENT_SOURCE_DIR}/structwitharray.xml) add_executable(nodeAttributes nodeAttributes.c) target_include_directories(nodeAttributes PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(nodeAttributes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(nodeAttributes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME nodeAttributes_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND nodeAttributes ${CMAKE_CURRENT_SOURCE_DIR}/nodeAttributes.xml) add_executable(primitiveValues primitiveValues.c) target_include_directories(primitiveValues PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(primitiveValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(primitiveValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME primitiveValues_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND primitiveValues ${CMAKE_CURRENT_SOURCE_DIR}/primitiveValues.xml) add_executable(conversion conversion.c) target_include_directories(conversion PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(conversion PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(conversion PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME conversion_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND conversion) add_executable(issue_246 issue_246.c) target_include_directories(issue_246 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_246 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(issue_246 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME issue_246_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_246 ${CMAKE_CURRENT_SOURCE_DIR}/issue_246.xml) add_executable(issue_246_2 issue_246_2.c) target_include_directories(issue_246_2 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_246_2 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(issue_246_2 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME issue_246_2_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_246_2 ${CMAKE_CURRENT_SOURCE_DIR}/issue_246_2.xml) add_executable(issue_266 issue_266_testdata.c) target_include_directories(issue_266 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_266 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${PTHREAD_LIB}) +target_link_libraries(issue_266 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) add_test(NAME issue_266_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_266 ${CMAKE_CURRENT_SOURCE_DIR}/issue266_TestData.NodeSet2.xml) From c4b730d5b148881a22e54cd1787de941c4b19222 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 11:41:44 +0100 Subject: [PATCH 12/15] namespace zero full --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 838dad2..5f310cc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,6 +37,7 @@ jobs: - name: Build nodesetLoader run: | cd ./nodesetLoader && cmake "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake" -DCMAKE_BUILD_TYPE=Release ` + -DUA_NAMESPACE_ZERO=FULL ` -DENABLE_TESTING=ON ` -DENABLE_CONAN=ON . && ` cmake --build . From 71ebf776769a1b6e7927a56e0f7a9c429ea121a2 Mon Sep 17 00:00:00 2001 From: Matthias Konnerth Date: Wed, 20 Nov 2024 12:25:26 +0100 Subject: [PATCH 13/15] debug --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5f310cc..923ea88 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,7 +36,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: Build nodesetLoader run: | - cd ./nodesetLoader && cmake "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake" -DCMAKE_BUILD_TYPE=Release ` + cd ./nodesetLoader && cmake "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake" -DCMAKE_BUILD_TYPE=Debug ` -DUA_NAMESPACE_ZERO=FULL ` -DENABLE_TESTING=ON ` -DENABLE_CONAN=ON . && ` From b4859c13508d1673dd141495c265c27141dadf38 Mon Sep 17 00:00:00 2001 From: mkonnerth Date: Thu, 21 Nov 2024 01:33:06 +0100 Subject: [PATCH 14/15] disable issue241 test --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 923ea88..07b5c69 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,4 +47,4 @@ jobs: # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html # for more detail - run: cd ./nodesetLoader && ctest -C Debug --verbose + run: cd ./nodesetLoader && ctest -E issue_241_Test -C Debug --verbose From d827ac3c271b86166ad0e97d473b9e8158f62a61 Mon Sep 17 00:00:00 2001 From: mkonnerth Date: Thu, 21 Nov 2024 02:04:04 +0100 Subject: [PATCH 15/15] check libraries --- CMakeLists.txt | 3 ++ backends/open62541/tests/CMakeLists.txt | 46 ++++++++++++------------- tests/CMakeLists.txt | 10 +++--- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 615a38d..077e2d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,6 +180,9 @@ endif() if(${ENABLE_TESTING}) find_package(Check REQUIRED) + if(NOT CHECK_LIBRARIES) + set(CHECK_LIBRARIES Check::check) + endif() include(CTest) endif() diff --git a/backends/open62541/tests/CMakeLists.txt b/backends/open62541/tests/CMakeLists.txt index b4a5740..f0555f9 100644 --- a/backends/open62541/tests/CMakeLists.txt +++ b/backends/open62541/tests/CMakeLists.txt @@ -1,90 +1,90 @@ add_executable(import import.c) target_include_directories(import PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(import PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(import PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME import_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND import ${PROJECT_SOURCE_DIR}/nodesets/testNodeset100nodes.xml) add_executable(namespaceZeroValues namespaceZeroValues.c) target_include_directories(namespaceZeroValues PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(namespaceZeroValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(namespaceZeroValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME namespaceZeroValues_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND namespaceZeroValues ${CMAKE_CURRENT_SOURCE_DIR}/namespaceZeroValues.xml) add_executable(customTypesWithValues customTypesWithValues.c) target_include_directories(customTypesWithValues PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(customTypesWithValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(customTypesWithValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME customTypesWithValues_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND customTypesWithValues ${CMAKE_CURRENT_SOURCE_DIR}/customTypesWithValues.xml) add_executable(subDataTypes subDataTypes.c) target_include_directories(subDataTypes PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(subDataTypes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(subDataTypes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME subDataTypes_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND subDataTypes ${CMAKE_CURRENT_SOURCE_DIR}/subDataTypes.xml) add_executable(valueRank valueRank.c) target_include_directories(valueRank PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(valueRank PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(valueRank PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME valueRank_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND valueRank ${CMAKE_CURRENT_SOURCE_DIR}/valueRank.xml) add_executable(basicNodeClasses basicNodeClasses.c) target_include_directories(basicNodeClasses PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(basicNodeClasses PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(basicNodeClasses PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME basicNodeClasses_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND basicNodeClasses ${CMAKE_CURRENT_SOURCE_DIR}/basicNodeClasses.xml) add_executable(issue_201 issue_201.c) target_include_directories(issue_201 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_201 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(issue_201 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME issue_201_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_201 ${CMAKE_CURRENT_SOURCE_DIR}/issue_201.xml) add_executable(issue_241 issue_241.c) target_include_directories(issue_241 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_241 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(issue_241 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME issue_241_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_241 ${CMAKE_CURRENT_SOURCE_DIR}/issue_241.xml) add_executable(stringNodeId_issue_224 stringNodeId_issue_224.c) target_include_directories(stringNodeId_issue_224 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(stringNodeId_issue_224 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(stringNodeId_issue_224 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME stringNodeId_issue_224 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND stringNodeId_issue_224 ${CMAKE_CURRENT_SOURCE_DIR}/stringNodeId_issue_224.xml) add_executable(orderingStringNodeIds orderingStringNodeIds.c) target_include_directories(orderingStringNodeIds PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(orderingStringNodeIds PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(orderingStringNodeIds PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME orderingStringNodeIds WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND orderingStringNodeIds ${CMAKE_CURRENT_SOURCE_DIR}/orderingStringNodeIds.xml) add_executable(cornerCases cornerCases.c) target_include_directories(cornerCases PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(cornerCases PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(cornerCases PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME cornerCases_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND cornerCases ${CMAKE_CURRENT_SOURCE_DIR}/cornerCases.xml) add_executable(extension extension.c) target_include_directories(extension PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(extension PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(extension PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME extension_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND extension ${CMAKE_CURRENT_SOURCE_DIR}/extension.xml) add_executable(newHierachicalRef newHierachicalRef.c) target_include_directories(newHierachicalRef PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(newHierachicalRef PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(newHierachicalRef PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME newHierachicalRef_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND newHierachicalRef ${CMAKE_CURRENT_SOURCE_DIR}/newHierachicalRef.xml @@ -92,70 +92,70 @@ add_test(NAME newHierachicalRef_Test add_executable(references references.c) target_include_directories(references PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(references PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(references PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME references_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND references ${CMAKE_CURRENT_SOURCE_DIR}/references.xml) add_executable(multipleNamespaces multipleNamespaces.c) target_include_directories(multipleNamespaces PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(multipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(multipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME multipleNamespaces_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND multipleNamespaces ${CMAKE_CURRENT_SOURCE_DIR}/multipleNamespaces.xml) add_executable(structMultipleNamespaces structMultipleNamespaces.c) target_include_directories(structMultipleNamespaces PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(structMultipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(structMultipleNamespaces PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME structMultipleNamespaces_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND structMultipleNamespaces ${CMAKE_CURRENT_SOURCE_DIR}/basestruct.xml ${CMAKE_CURRENT_SOURCE_DIR}/extendedstruct.xml) add_executable(structwitharray structwitharray.c) target_include_directories(structwitharray PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(structwitharray PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(structwitharray PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME structwitharray_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND structwitharray ${CMAKE_CURRENT_SOURCE_DIR}/structwitharray.xml) add_executable(nodeAttributes nodeAttributes.c) target_include_directories(nodeAttributes PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(nodeAttributes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(nodeAttributes PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME nodeAttributes_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND nodeAttributes ${CMAKE_CURRENT_SOURCE_DIR}/nodeAttributes.xml) add_executable(primitiveValues primitiveValues.c) target_include_directories(primitiveValues PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(primitiveValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(primitiveValues PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME primitiveValues_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND primitiveValues ${CMAKE_CURRENT_SOURCE_DIR}/primitiveValues.xml) add_executable(conversion conversion.c) target_include_directories(conversion PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(conversion PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(conversion PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME conversion_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND conversion) add_executable(issue_246 issue_246.c) target_include_directories(issue_246 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_246 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(issue_246 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME issue_246_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_246 ${CMAKE_CURRENT_SOURCE_DIR}/issue_246.xml) add_executable(issue_246_2 issue_246_2.c) target_include_directories(issue_246_2 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_246_2 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(issue_246_2 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME issue_246_2_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_246_2 ${CMAKE_CURRENT_SOURCE_DIR}/issue_246_2.xml) add_executable(issue_266 issue_266_testdata.c) target_include_directories(issue_266 PRIVATE ${CHECK_INCLUDE_DIR}) -target_link_libraries(issue_266 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} Check::check ${PTHREAD_LIB}) +target_link_libraries(issue_266 PRIVATE NodesetLoader open62541::open62541 ${CHECK_LIBRARIES} ${CHECK_LIBRARIES} ${PTHREAD_LIB}) add_test(NAME issue_266_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND issue_266 ${CMAKE_CURRENT_SOURCE_DIR}/issue266_TestData.NodeSet2.xml) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a1d244e..ede4cee 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(sort sort.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/Sort.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/nodes/InstanceNode.c) target_include_directories(sort PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_SOURCE_DIR}/../include) -target_link_libraries(sort PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(sort PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME sort_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND sort ${CMAKE_CURRENT_LIST_DIR}) add_executable(nodeContainer @@ -13,21 +13,21 @@ add_executable(nodeContainer ${CMAKE_CURRENT_SOURCE_DIR}/../src/Value.c ) target_include_directories(nodeContainer PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../src) -target_link_libraries(nodeContainer PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(nodeContainer PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME nodeContainer_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND nodeContainer ${CMAKE_CURRENT_LIST_DIR}) add_executable(value ValueTest.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/Value.c) target_include_directories(value PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include) -target_link_libraries(value PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(value PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME value_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND value ${CMAKE_CURRENT_LIST_DIR}) add_executable(allocator allocator.c ${CMAKE_CURRENT_SOURCE_DIR}/../src/CharAllocator.c) target_include_directories(allocator PRIVATE ${CHECK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../src) -target_link_libraries(allocator PRIVATE Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(allocator PRIVATE ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) add_test(NAME allocatorTest WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND allocator ${CMAKE_CURRENT_LIST_DIR}) add_executable(parser parser.c) -target_link_libraries(parser PRIVATE NodesetLoader Check::check ${PTHREAD_LIB} coverageLib open62541::open62541) +target_link_libraries(parser PRIVATE NodesetLoader ${CHECK_LIBRARIES} ${PTHREAD_LIB} coverageLib open62541::open62541) target_include_directories(parser PRIVATE ${CHECK_INCLUDE_DIR}) add_test(NAME parser_Test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}