File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -33,9 +33,14 @@ if(WIN32 AND NOT CYGWIN)
3333else ()
3434 set (CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} /${PROJECT_NAME } /cmake)
3535endif ()
36- string ( REGEX REPLACE "[^/]+ " ".." RELATIVE_PATH_CMAKE_DIR_TO_PREFIX " ${CMAKE_CONFIG_INSTALL_DIR } " )
36+ file ( RELATIVE_PATH RELATIVE_PATH_CMAKE_DIR_TO_PREFIX " ${CMAKE_CONFIG_INSTALL_DIR} " "${ CMAKE_INSTALL_PREFIX } " )
3737
3838set (PACKAGE_NAME ${PROJECT_NAME } )
39+ string (REPLACE
40+ "${CMAKE_INSTALL_PREFIX } "
41+ "\$ {${PROJECT_NAME } _DIR}/${RELATIVE_PATH_CMAKE_DIR_TO_PREFIX} "
42+ cmake_conf_include_dir
43+ "${CMAKE_INSTALL_FULL_INCLUDEDIR} " )
3944set (cmake_conf_file "${PROJECT_NAME } -config.cmake" )
4045configure_file ("${CMAKE_CURRENT_SOURCE_DIR } /cmake/${cmake_conf_file} .in" "${CMAKE_BINARY_DIR } /${cmake_conf_file} " @ONLY )
4146set (cmake_conf_version_file "${PROJECT_NAME } -config-version.cmake" )
@@ -55,6 +60,7 @@ install(FILES
5560
5661# Make the package config file
5762set (PACKAGE_DESC "Unified Robot Description Format" )
63+ string (REPLACE "${CMAKE_INSTALL_PREFIX } " "\$ {prefix}" pkg_conf_includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR} " )
5864set (pkg_conf_file "urdfdom_headers.pc" )
5965configure_file ("${CMAKE_CURRENT_SOURCE_DIR } /cmake/pkgconfig/${pkg_conf_file} .in" "${CMAKE_BINARY_DIR } /${pkg_conf_file} " @ONLY )
6066install (FILES "${CMAKE_BINARY_DIR } /${pkg_conf_file} " DESTINATION ${CMAKE_INSTALL_LIBDIR} /pkgconfig/ COMPONENT pkgconfig)
Original file line number Diff line number Diff line change 11# This file was generated by CMake for @PROJECT_NAME@
22prefix = @CMAKE_INSTALL_PREFIX@
33exec_prefix = ${ prefix}
4- includedir = ${ prefix } /@CMAKE_INSTALL_INCLUDEDIR @
4+ includedir = @pkg_conf_includedir @
55
66Name : @PACKAGE_NAME@
77Description : @PACKAGE_DESC@
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED)
33endif ()
44set (@PACKAGE_NAME@_CONFIG_INCLUDED TRUE )
55
6- set (@PACKAGE_NAME@_INCLUDE_DIRS "${@ PROJECT_NAME @_DIR} /@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR @" )
6+ set (@PACKAGE_NAME@_INCLUDE_DIRS "@cmake_conf_include_dir @" )
77
88include ("${@PACKAGE_NAME@_DIR} /@PACKAGE_NAME@Export.cmake" )
99
You can’t perform that action at this time.
0 commit comments