Commit f1195aba authored by jan.koester's avatar jan.koester
Browse files

Merge branch 'main' of https://tuxist.de/git/tuxist/uuidplus

parents 960c954e 654ba863

src/CMakeLists.txt

+9 −7
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ install(TARGETS uuidp DESTINATION lib EXPORT uuidpTargets) 


include(CMakePackageConfigHelpers)



set_property(TARGET uuidp APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_INSTALL_INCLUDEDIR}")



write_basic_package_version_file(

  "${CMAKE_CURRENT_BINARY_DIR}/libuuidpConfigVersion.cmake"

  VERSION ${Upstream_VERSION}
@@ -25,6 +27,13 @@ export(EXPORT uuidpTargets 
  NAMESPACE uuidp::

)



install(FILES

        uuidp.h

        "${CMAKE_CURRENT_BINARY_DIR}/uuidp_export.h"

        DESTINATION include/httppp

        COMPONENT Devel

)



configure_package_config_file(

  "${CMAKE_SOURCE_DIR}/uuid.cmake.in"

  "${CMAKE_CURRENT_BINARY_DIR}/libuuidpConfig.cmake"
@@ -53,13 +62,6 @@ install( 
    Devel

)



install(

    FILES

        uuidp.h

        "${CMAKE_CURRENT_BINARY_DIR}/uuidp_export.h"

    DESTINATION include

)



install(TARGETS uuid-gen DESTINATION bin)



if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")

uuid.cmake.in

+2 −1
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ include(CMakeFindDependencyMacro) 
include(${CMAKE_CURRENT_LIST_DIR}/libuuidpTargets.cmake)

include(${CMAKE_CURRENT_LIST_DIR}/libuuidpConfigVersion.cmake)



set(UUIDP_INCLUDE_DIR   "${CMAKE_CURRENT_LIST_DIR}../../../include")

set(UUIDP_INCLUDE_DIR   "${CMAKE_INSTALL_PREFIX}/include")

set(UUIDP_CONFIG_DIR    "${CMAKE_CURRENT_LIST_DIR}" )