Commit 9673e04e authored by atl Upstream's avatar atl Upstream Committed by Atkins, Charles Vernon
Browse files

atl 2018-03-29 (2e96cc74)

Code extracted from:

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

at commit 2e96cc746d3735c23723c3ac85d90906ec7153bd (master).

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

Chuck Atkins (1):
      ae51a97f Add pkg-config support
parent 83be08e9
Loading
Loading
Loading
Loading
+21 −6
Original line number Diff line number Diff line
@@ -120,11 +120,30 @@ set_target_properties(atl PROPERTIES
  PUBLIC_HEADER atl.h)
add_library(atl::atl ALIAS atl)

target_include_directories(atl PUBLIC
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

if(NOT ANDROID)
  find_package(Threads)
  target_link_libraries(atl ${CMAKE_THREADS_LIBS_INIT})
  target_link_libraries(atl PRIVATE ${CMAKE_THREADS_LIBS_INIT})
endif()

# Setup pkgconfig
configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/atl.pc.in
  ${CMAKE_CURRENT_BINARY_DIR}/atl.pc
  @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/atl.pc
  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/atl-config.in
  ${CMAKE_CURRENT_BINARY_DIR}/atl-config
  @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/atl-config
  DESTINATION "${CMAKE_INSTALL_BINDIR}")

install(FILES atl.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(TARGETS atl
  # IMPORTANT: Add the foo library to the "export-set"
@@ -134,10 +153,6 @@ install(TARGETS atl
  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT dev)

target_include_directories(atl PUBLIC
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

option(ATL_LIBRARIES_ONLY "Don't built the ATL utility executables" OFF)
if(NOT ATL_LIBRARIES_ONLY)

atl-config.in

0 → 100755
+4 −0
Original line number Diff line number Diff line
#!/bin/bash

export PKG_CONFIG_LIBDIR=$(realpath $(dirname $(realpath ${BASH_SOURCE}))/..)/@CMAKE_INSTALL_LIBDIR@/pkgconfig
pkg-config atl "$@"

atl.pc.in

0 → 100644
+11 −0
Original line number Diff line number Diff line
prefix=@CMAKE_INSTALL_PREFIX@
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

Name: ATL
Description: Efficient binary lists of name-value pairs
URL: https://github.com/GTkorvo/atl.git
Version: @ATL_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -l@ATL_LIBRARY_PREFIX@atl
Libs.private: @CMAKE_THREADS_LIBS_INIT@

lookup3.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.