Commit 77c9cb6d authored by enet Upstream's avatar enet Upstream Committed by Atkins, Charles Vernon
Browse files

enet 2018-03-27 (152ed547) 

Code extracted from:

    https://github.com/GTkorvo/enet.git

at commit 152ed547fd6353a321a337cf12d2d4976775d480 (master).

Upstream Shortlog
-----------------

Chuck Atkins (3):
      ef329bc9 Fix output name property for static libs
      c554971f Adjust version file for reworked cmake interface
      9eac3a9a Change cmakedir install location
parent f048e473

CMakeLists.txt

+13 −17
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory") 
set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Installation library subdirectory")

set(CMAKE_INSTALL_INCLUDEDIR include

  CACHE STRING "Installation include subdirectory")

set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake

set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/enet

  CACHE STRING "Installation CMake subdirectory")

mark_as_advanced(CMAKE_INSTALL_BINDIR)

mark_as_advanced(CMAKE_INSTALL_LIBDIR)
@@ -82,6 +82,10 @@ int main() { return sizeof(socklen_t); } ]=] 
  HAS_SOCKLEN_T

)



set(ENET_LIBRARY_PREFIX "" CACHE STRING

  "Prefix to prepend to the output library name")

mark_as_advanced(ENET_LIBRARY_PREFIX)



add_library(enet

  callbacks.c

  compress.c
@@ -91,7 +95,13 @@ add_library(enet 
  peer.c

  protocol.c

)

set_target_properties(enet PROPERTIES

  OUTPUT_NAME ${ENET_LIBRARY_PREFIX}enet

  VERSION ${ENET_VERSION}

  SOVERSION ${ENET_VERSION_MAJOR}

)

add_library(enet::enet ALIAS enet)



target_compile_definitions(enet PRIVATE

  $<$<BOOL:${HAS_GETADDRINFO}>:HAS_GETADDRINFO>

  $<$<BOOL:${HAS_GETNAMEINFO}>:HAS_GETNAMEINFO>
@@ -104,14 +114,6 @@ target_compile_definitions(enet PRIVATE 
  $<$<BOOL:${HAS_MSGHDR_FLAGS}>:HAS_MSGHDR_FLAGS>

  $<$<BOOL:${HAS_SOCKLEN_T}>:HAS_SOCKLEN_T>

)

set(ENET_LIBRARY_PREFIX "" CACHE STRING

  "Prefix to prepend to the output library name")

mark_as_advanced(ENET_LIBRARY_PREFIX)

if(ENET_LIBRARY_PREFIX)

  set_target_properties(enet PROPERTIES

    LIBRARY_OUTPUT_NAME ${ENET_LIBRARY_PREFIX}enet

  )

endif()



if(UNIX)

  target_sources(enet PRIVATE unix.c)
@@ -124,11 +126,6 @@ target_include_directories(enet PUBLIC 
  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

)



set_target_properties(enet PROPERTIES

  VERSION ${ENET_VERSION}

  SOVERSION ${ENET_VERSION_MAJOR}

)

 

install(DIRECTORY include/enet

  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"

  FILES_MATCHING PATTERN "*.h"
@@ -140,7 +137,6 @@ install(TARGETS enet 
  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}"

)





# Setup packaging and configs

 

# Add all targets to the build-tree export set
@@ -155,8 +151,8 @@ configure_file(enet-config-version.cmake.in 
install(FILES

  "${PROJECT_BINARY_DIR}/enet-config.cmake"

  "${PROJECT_BINARY_DIR}/enet-config-version.cmake"

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}/enet")

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")

 

# Install the export set for use with the install-tree

install(EXPORT enet-targets NAMESPACE enet::

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}/enet")
 
  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")

enet-config-version.cmake.in

+8 −4
Original line number Diff line number Diff line 
set(PACKAGE_VERSION "@ENET_VERSION@")

set(PACKAGE_VERSION_MAJOR @ENET_VERSION_MAJOR@)

set(PACKAGE_VERSION_MINOR @ENET_VERSION_MINOR@)

set(PACKAGE_VERSION_PATCH @ENET_VERSION_PATCH@)

set(PACKAGE_VERSION @ENET_VERSION@)



# Check whether the requested PACKAGE_FIND_VERSION is compatible

if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR

   PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR)

  set(PACKAGE_VERSION_COMPATIBLE FALSE)

else()

  set(PACKAGE_VERSION_COMPATIBLE TRUE)

  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")

  if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)

    set(PACKAGE_VERSION_EXACT TRUE)

  endif()

endif()