Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-27 12:33:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_cmake' (also) into stable.

Browse Source
This commit is contained in:
Florian Pose
2022-03-04 10:12:12 +01:00
parent 3ee5e50a48
commit 9b1be4848b
5 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Makefile.am
+4 -4
View File
@@ -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),' $< > $@
lib/EtherCATConfig.cmake.in → lib/ethercat-config.cmake.in
+4 -4
View File
@@ -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}"
)