From 9d484de82a0c5de6cf9161f626fbe650ca0eb532 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Sat, 1 Jan 2022 23:41:23 +0100 Subject: [PATCH] Fix cmake config module --- lib/Makefile.am | 8 ++++---- lib/{EtherCATConfig.cmake.in => ethercat-config.cmake.in} | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename lib/{EtherCATConfig.cmake.in => ethercat-config.cmake.in} (90%) diff --git a/lib/Makefile.am b/lib/Makefile.am index 4d9879ed..330c1e34 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -75,11 +75,11 @@ libethercat_la_LDFLAGS = -version-info 2:0:1 pkgconfig_DATA = libethercat.pc -cmakedir = $(libdir)/cmake +cmakedir = $(libdir)/cmake/ethercat -cmake_DATA = EtherCATConfig.cmake +cmake_DATA = ethercat-config.cmake -EXTRA_DIST = EtherCATConfig.cmake.in +EXTRA_DIST = ethercat-config.cmake.in CLEANFILES = $(cmake_DATA) @@ -110,5 +110,5 @@ endif # we need to replace the variables manually, because autotools does not expand them. -EtherCATConfig.cmake: $(srcdir)/EtherCATConfig.cmake.in Makefile +ethercat-config.cmake: $(srcdir)/ethercat-config.cmake.in Makefile $(SED) -e 's,%libdir%,$(libdir),' -e 's,%includedir%,$(includedir),' $< > $@ diff --git a/lib/EtherCATConfig.cmake.in b/lib/ethercat-config.cmake.in similarity index 90% rename from lib/EtherCATConfig.cmake.in rename to lib/ethercat-config.cmake.in index a803ac0c..e516f5a8 100644 --- a/lib/EtherCATConfig.cmake.in +++ b/lib/ethercat-config.cmake.in @@ -29,7 +29,7 @@ find_library(EtherCAT_LIBRARY - NAMES EtherCAT + NAMES ethercat PATHS %libdir% ) @@ -40,9 +40,9 @@ find_path(EtherCAT_INCLUDE_DIR mark_as_advanced(EtherCAT_LIBRARY EtherCAT_INCLUDE_DIR) -if(NOT TARGET EtherLab::EtherCAT) - add_library(EtherLab::EtherCAT SHARED IMPORTED) - set_target_properties(EtherLab::EtherCAT PROPERTIES +if(NOT TARGET EtherLab::ethercat) + add_library(EtherLab::ethercat SHARED IMPORTED) + set_target_properties(EtherLab::ethercat PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${EtherCAT_INCLUDE_DIR}" IMPORTED_LOCATION "${EtherCAT_LIBRARY}" )