Commit 878fcc3a authored by jan.koester's avatar jan.koester
Browse files

fix

parent 2d24a7eb

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ project(uuidplus) 
set(LIBV "1.0.0")

set(Upstream_VERSION 1.0.0)



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

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



if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")

    set(CMAKE_INSTALL_PREFIX "c:/Program Files/libuuidp")

endif()



add_subdirectory(src)

src/CMakeLists.txt

+2 −4
Original line number Diff line number Diff line
@@ -41,15 +41,13 @@ configure_package_config_file( 
  @ONLY

)



set(ConfigPackageLocation lib/cmake/libuuidp)



install(EXPORT uuidpTargets

  FILE

    libuuidpTargets.cmake

  NAMESPACE

    uuidp::

  DESTINATION

    ${ConfigPackageLocation}

    "lib/cmake/libuuidp"

)



install(
@@ -57,7 +55,7 @@ install( 
    "${CMAKE_CURRENT_BINARY_DIR}/libuuidpConfig.cmake"

    "${CMAKE_CURRENT_BINARY_DIR}/libuuidpConfigVersion.cmake"

  DESTINATION

    ${ConfigPackageLocation}

    "lib/cmake/libuuidp"

  COMPONENT

    Devel

)

uuid.cmake.in

+1 −1
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/libuuidpTargets.cmake) 
include(${CMAKE_CURRENT_LIST_DIR}/libuuidpConfigVersion.cmake)



set(LIBUUIDP_INCLUDE_DIR   "@CMAKE_INSTALL_PREFIX@/include")

set(LIBUUIDP_CONFIG_DIR    "@CMAKE_INSTALL_PREFIX@/@ConfigPackageLocation@")

set(LIBUUIDP_CONFIG_DIR    "@CMAKE_INSTALL_PREFIX@/lib/cmake/libuuidp")