Commit e653548c authored by dill Upstream's avatar dill Upstream Committed by Kyle Edwards
Browse files

dill 2019-06-18 (7ad8a9a0) 

Code extracted from:

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

at commit 7ad8a9a0a6922fac0d133db8c383dd985ce9b818 (master).

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

Kyle Edwards (2):
      8aa369d6 Make header and pkgconfig installation optional
      7e55b151 Use GNUInstallDirs
parent ff840b8f

CMakeLists.txt

+40 −38
Original line number Diff line number Diff line
@@ -3,15 +3,9 @@ cmake_minimum_required(VERSION 3.0) 
project(DILL VERSION 2.4.0 LANGUAGES C CXX)



# Some boilerplate to setup nice output directories

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")

include(GNUInstallDirs)

set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/dill

  CACHE STRING "Installation CMake subdirectory")

mark_as_advanced(CMAKE_INSTALL_BINDIR)

mark_as_advanced(CMAKE_INSTALL_LIBDIR)

mark_as_advanced(CMAKE_INSTALL_INCLUDEDIR)

mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)



list(INSERT CMAKE_PREFIX_PATH 0 ${CMAKE_INSTALL_PREFIX})
@@ -333,6 +327,9 @@ target_include_directories(dill 
target_link_libraries(dill PRIVATE ${TARGET_DEP_TGT} ${TARGET_DEP_LIBS})



# Setup pkgconfig

option(DILL_INSTALL_PKGCONFIG "Install Dill pkgconfig files" ON)

mark_as_advanced(DILL_INSTALL_PKGCONFIG)

if(DILL_INSTALL_PKGCONFIG)

  set(_pkg_config_private_libs)

  foreach(L ${PKG_DEP_LIBS})

    if(L MATCHES "(.*)/?lib(.*)\\.")
@@ -365,9 +362,14 @@ configure_file( 
  )

  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/dill-config

    DESTINATION "${CMAKE_INSTALL_BINDIR}")

endif()



option(DILL_INSTALL_HEADERS "Install Dill header files" ON)

mark_as_advanced(DILL_INSTALL_HEADERS)

if(DILL_INSTALL_HEADERS)

  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dill.h"

    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

endif()



install(TARGETS dill

  # IMPORTANT: Add the dill library to the "export-set"