Commit 83be08e9 authored by atl Upstream's avatar atl Upstream Committed by Atkins, Charles Vernon
Browse files

atl 2018-03-27 (bd64dd53) 

Code extracted from:

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

at commit bd64dd53f4ba20112a159ef7b9db29739315378c (master).

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

Chuck Atkins (3):
      1644f956 Fix output name property for static libs
      c667d3b4 Bump patch version for reworked cmake interface
      069b5a19 Change install location of CMake files
parent 8ffeb570

CMakeLists.txt

+11 −15
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ cmake_minimum_required(VERSION 2.8.3) 
# raised to > 3.0

if(POLICY CMP0048)

  cmake_policy(SET CMP0048 NEW)

  project(ATL VERSION 2.2.0 LANGUAGES C)

  project(ATL VERSION 2.2.1 LANGUAGES C)

else()

  project(ATL C)

  set(ATL_MAJOR_VERSION 2)

  set(ATL_MINOR_VERSION 2)

  set(ATL_PATCH_VERSION 0)

  set(ATL_PATCH_VERSION 1)

  set(ATL_VERSION

    ${ATL_MAJOR_VERSION}.${ATL_MINOR_VERSION}.${ATL_PATCH_VERSION})

endif()
@@ -20,7 +20,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/atl

  CACHE STRING "Installation CMake subdirectory")

mark_as_advanced(CMAKE_INSTALL_BINDIR)

mark_as_advanced(CMAKE_INSTALL_LIBDIR)
@@ -113,22 +113,18 @@ set(ATL_LIBRARY_PREFIX "" CACHE STRING 
mark_as_advanced(ATL_LIBRARY_PREFIX)



add_library(atl atom.c attr.c lookup3.c tclHash.c)

if(ATL_LIBRARY_PREFIX)

set_target_properties(atl PROPERTIES

    LIBRARY_OUTPUT_NAME ${ATL_LIBRARY_PREFIX}atl)

endif()



  OUTPUT_NAME ${ATL_LIBRARY_PREFIX}atl

  VERSION ${ATL_VERSION}

  SOVERSION ${ATL_VERSION_MAJOR}

  PUBLIC_HEADER atl.h)

add_library(atl::atl ALIAS atl)



if(NOT ANDROID)

  find_package(Threads)

  target_link_libraries(atl ${CMAKE_THREADS_LIBS_INIT})

endif()

 

set_target_properties(atl PROPERTIES

  VERSION ${ATL_VERSION}

  SOVERSION ${ATL_VERSION_MAJOR}

  PUBLIC_HEADER atl.h)

 

install(FILES atl.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

install(TARGETS atl

  # IMPORTANT: Add the foo library to the "export-set"
@@ -184,11 +180,11 @@ configure_file(atl-config-version.cmake.in 
install(FILES

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

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

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}/atl" COMPONENT dev)

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" COMPONENT dev)

 

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

install(EXPORT atl-targets NAMESPACE atl::

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}/atl" COMPONENT dev)

  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" COMPONENT dev)



set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/atl.supp)

atl-config-version.cmake.in

+6 −2
Original line number Diff line number Diff line 
set(PACKAGE_VERSION_MAJOR @ATL_VERSION_MAJOR@)

set(PACKAGE_VERSION_MINOR @ATL_VERSION_MINOR@)

set(PACKAGE_VERSION_PATCH @ATL_VERSION_PATCH@)

set(PACKAGE_VERSION @ATL_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)