Commit 9c3c9df9 authored by jan.koester's avatar jan.koester
Browse files

gnudirs

parent 2a46b582

CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ enable_testing () 
set(LIBV "1.0.0")

set(Upstream_VERSION 1.0.0)



include(GNUInstallDirs)



set (DEFAULT_UPLOADSIZE 4e+6 CACHE STRING "Block size for Uploads")



set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

doc/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ if(BUILD_DOCUMENTATION) 
        COMMENT "Generating API documentation with Doxygen"

        VERBATIM)



    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/libhttppp)

    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/libhttppp)

endif()

src/CMakeLists.txt

+9 −11
Original line number Diff line number Diff line
@@ -27,24 +27,22 @@ else() 
  target_link_libraries(httppp-static netplus::netplus-static cmdplus::cmdplus pthread)

endif()



SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")



set_property(TARGET httppp PROPERTY VERSION ${Upstream_VERSION})

set_property(TARGET httppp PROPERTY SOVERSION ${LIBV})

set_property(TARGET httppp PROPERTY INTERFACE_httppp_MAJOR_VERSION ${LIBV})

set_property(TARGET httppp APPEND PROPERTY COMPATIBLE_INTERFACE_STRING httppp_MAJOR_VERSION)



install(TARGETS httppp EXPORT httpppTargets

  LIBRARY DESTINATION lib

  ARCHIVE DESTINATION lib

  RUNTIME DESTINATION bin

  INCLUDES DESTINATION include

  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

)



install(TARGETS httppp-static EXPORT httpppTargets

  LIBRARY DESTINATION lib

  ARCHIVE DESTINATION lib

  INCLUDES DESTINATION include

  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

)



install(FILES httpd.h
@@ -57,7 +55,7 @@ install(FILES httpd.h 
              mimetypes.h

              "${CMAKE_BINARY_DIR}/config.h"

              "${CMAKE_CURRENT_BINARY_DIR}/httppp_export.h"

        DESTINATION include/httppp

        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/httppp

        COMPONENT Devel

)
@@ -80,7 +78,7 @@ configure_package_config_file( 
  @ONLY

)



set(ConfigPackageLocation lib/cmake/libhttppp)

set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/libhttppp)

install(EXPORT httpppTargets

  FILE

    libhttpppTargets.cmake