[libmodbus] Avoid check_include_file on Windows. Move inclues to root.

3 files changed, 50 insertions, 41 deletions

diff --git a/ports/libmodbus/CMakeLists.txt b/ports/libmodbus/CMakeLists.txt
index cab9c897d..0abb4b6a7 100644
--- a/ports/libmodbus/CMakeLists.txt
+++ b/ports/libmodbus/CMakeLists.txt
@@ -7,41 +7,52 @@ set(LIBMODBUS_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(LIBMODBUS_VERSION_MICRO ${PROJECT_VERSION_PATCH})

 configure_file(src/modbus-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/modbus-version.h)

 

-include(CheckIncludeFile)

-check_include_file(arpa/inet.h HAVE_ARPA_INET_H)

-check_include_file(byteswap.h HAVE_BYTESWAP_H)

-check_include_file(errno.h HAVE_ERRNO_H)

-check_include_file(fcntl.h HAVE_FCNTL_H)

-check_include_file(limits.h HAVE_LIMITS_H)

-check_include_file(linux/serial.h HAVE_LINUX_SERIAL_H)

-check_include_file(netdb.h HAVE_NETDB_H)

-check_include_file(netinet/in.h HAVE_NETINET_IN_H)

-check_include_file(netinet/tcp.h HAVE_NETINET_TCP_H)

-check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)

-check_include_file(sys/params.h HAVE_SYS_PARAMS_H)

-check_include_file(sys/socket.h HAVE_SYS_SOCKET_H)

-check_include_file(sys/time.h HAVE_SYS_TIME_H)

-check_include_file(sys/types.h HAVE_SYS_TYPES_H)

-check_include_file(termios.h HAVE_TERMIOS_H)

-check_include_file(time.h HAVE_TIME_H)

-check_include_file(unistd.h HAVE_UNISTD_H)

-

-include(CheckFunctionExists)

-check_function_exists(accept4 HAVE_ACCEPT4)

-check_function_exists(fork HAVE_FORK)

-check_function_exists(getaddrinfo HAVE_GETADDRINFO)

-check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)

-check_function_exists(inet_ntoa HAVE_INET_NTOA)

-check_function_exists(malloc HAVE_MALLOC)

-check_function_exists(memset HAVE_MEMSET)

-check_function_exists(select HAVE_SELECT)

-check_function_exists(socket HAVE_SOCKET)

-check_function_exists(strerror HAVE_STRERROR)

-check_function_exists(strlcpy HAVE_STRLCPY)

-

-include(CheckSymbolExists)

-check_symbol_exists(TIOCSRS485 sys/ioctl.h HAVE_TIOCRS485)

-check_symbol_exists(TIOCM_RTS sys/ioctl.h HAVE_TIOCM_RTS)

+if(WIN32)

+  set(HAVE_ERRNO_H 1)

+  set(HAVE_FCNTL_H 1)

+  set(HAVE_LIMITS_H 1)

+  set(HAVE_SYS_TYPES_H 1)

+  set(HAVE_TIME_H 1)

+  set(HAVE_MALLOC 1)

+  set(HAVE_MEMSET 1)

+  set(HAVE_STRERROR 1)

+else()

+  include(CheckIncludeFile)

+  check_include_file(arpa/inet.h HAVE_ARPA_INET_H)

+  check_include_file(byteswap.h HAVE_BYTESWAP_H)

+  check_include_file(errno.h HAVE_ERRNO_H)

+  check_include_file(fcntl.h HAVE_FCNTL_H)

+  check_include_file(limits.h HAVE_LIMITS_H)

+  check_include_file(linux/serial.h HAVE_LINUX_SERIAL_H)

+  check_include_file(netdb.h HAVE_NETDB_H)

+  check_include_file(netinet/in.h HAVE_NETINET_IN_H)

+  check_include_file(netinet/tcp.h HAVE_NETINET_TCP_H)

+  check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)

+  check_include_file(sys/params.h HAVE_SYS_PARAMS_H)

+  check_include_file(sys/socket.h HAVE_SYS_SOCKET_H)

+  check_include_file(sys/time.h HAVE_SYS_TIME_H)

+  check_include_file(sys/types.h HAVE_SYS_TYPES_H)

+  check_include_file(termios.h HAVE_TERMIOS_H)

+  check_include_file(time.h HAVE_TIME_H)

+  check_include_file(unistd.h HAVE_UNISTD_H)

+

+  include(CheckFunctionExists)

+  check_function_exists(accept4 HAVE_ACCEPT4)

+  check_function_exists(fork HAVE_FORK)

+  check_function_exists(getaddrinfo HAVE_GETADDRINFO)

+  check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)

+  check_function_exists(inet_ntoa HAVE_INET_NTOA)

+  check_function_exists(malloc HAVE_MALLOC)

+  check_function_exists(memset HAVE_MEMSET)

+  check_function_exists(select HAVE_SELECT)

+  check_function_exists(socket HAVE_SOCKET)

+  check_function_exists(strerror HAVE_STRERROR)

+  check_function_exists(strlcpy HAVE_STRLCPY)

+

+  include(CheckSymbolExists)

+  check_symbol_exists(TIOCSRS485 sys/ioctl.h HAVE_TIOCRS485)

+  check_symbol_exists(TIOCM_RTS sys/ioctl.h HAVE_TIOCM_RTS)

+endif()

 

 configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

 

@@ -66,8 +77,7 @@ src/modbus.c)
 

 target_include_directories(modbus PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

 target_include_directories(modbus INTERFACE

-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>

-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/modbus>

+  $<INSTALL_INTERFACE:include>

 )

 set_target_properties(modbus PROPERTIES PUBLIC_HEADER "${MODBUS_PUBLIC_HEADERS}")

 

@@ -99,5 +109,5 @@ install(EXPORT libmodbusConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
 

 

 if(NOT DISABLE_INSTALL_HEADERS)

-  install(FILES ${MODBUS_PUBLIC_HEADERS} DESTINATION include/modbus)

+  install(FILES ${MODBUS_PUBLIC_HEADERS} DESTINATION include/)

 endif()

diff --git a/ports/libmodbus/CONTROL b/ports/libmodbus/CONTROL
index faee22d8c..1fd7d4791 100644
--- a/ports/libmodbus/CONTROL
+++ b/ports/libmodbus/CONTROL
@@ -1,3 +1,3 @@
 Source: libmodbus

-Version: 3.1.4

+Version: 3.1.4-1

 Description: libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol

diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake
index 3d1e1abe4..8d6f2c062 100644
--- a/ports/libmodbus/portfile.cmake
+++ b/ports/libmodbus/portfile.cmake
@@ -14,13 +14,12 @@ vcpkg_configure_cmake(
   SOURCE_PATH "${SOURCE_PATH}"

   PREFER_NINJA

   OPTIONS_DEBUG

-  -DDISABLE_INSTALL_HEADERS=ON

+    -DDISABLE_INSTALL_HEADERS=ON

 )

 

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

 

-

 vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")

 

 # Handle copyright