From 7e4aba9a6d8768a665ab96a2e45e3048c04ba196 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Tue, 22 Feb 2022 23:28:42 +0100 Subject: [PATCH] build user example with cmake and test it --- .gitignore | 3 ++- .gitlab-ci.yml | 13 +++++++++++++ examples/user/CMakeLists.txt | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 examples/user/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 3b085f26..914e5e2f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,8 @@ configure ethercat.spec examples/dc_user/ec_dc_user_example examples/user/ec_user_example -lib/EtherCATConfig.cmake +examples/user/build/ +lib/*.cmake lib/libethercat.la lib/libethercat.pc libtool diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e271a62e..3386d4e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,19 @@ build: - make -j8 all modules - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck +test cmake: + stage: test + + script: + - ./bootstrap + - ./configure --prefix=/tmp/ethercat_test_dir --disable-kernel + - make -j8 install + - cd examples/user + - mkdir build && cd build + - cmake -DCMAKE_PREFIX_PATH=/tmp/ethercat_test_dir -DCMAKE_BUILD_TYPE=Release .. + - make + - ldd userexample + pages: stage: deploy rules: diff --git a/examples/user/CMakeLists.txt b/examples/user/CMakeLists.txt new file mode 100644 index 00000000..2b112add --- /dev/null +++ b/examples/user/CMakeLists.txt @@ -0,0 +1,10 @@ +project(EtherCatUserExample C) +cmake_minimum_required(VERSION 3.2) + +find_package(EtherCAT REQUIRED) + +add_executable(userexample + main.c +) + +target_link_libraries(userexample PUBLIC EtherLab::ethercat)