Skip to content

Commit a259e31

Browse files
committed
config.cmake: avoid using ${PACKAGE_PREFIX_DIR} directly
1 parent 1babbf6 commit a259e31

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ write_basic_package_version_file(
8383
configure_package_config_file("${cmake_conf_file}.cmake.in"
8484
"${CMAKE_CURRENT_BINARY_DIR}/${cmake_conf_file}.cmake"
8585
INSTALL_DESTINATION ${CMAKE_CONFIG_INSTALL_DIR}
86+
PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR
8687
)
8788
install(FILES
8889
"${CMAKE_CURRENT_BINARY_DIR}/${cmake_conf_file}.cmake"

cmake/urdfdom-config.cmake.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
88
set(CMAKE_MODULE_PATH_BACKUP_URDFDOM ${CMAKE_MODULE_PATH})
99
list(APPEND CMAKE_MODULE_PATH "${@PROJECT_NAME@_DIR}")
1010

11-
set(@PKG_NAME@_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
11+
set(@PKG_NAME@_INCLUDE_DIRS "@PACKAGE_INSTALL_INCLUDEDIR@")
1212

1313
foreach(lib @PKG_LIBRARIES@)
1414
set(onelib "${lib}-NOTFOUND")
1515
set(onelibd "${lib}-NOTFOUND")
1616
find_library(onelib ${lib}
17-
PATHS "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@"
17+
PATHS "@PACKAGE_INSTALL_LIBDIR@"
1818
NO_DEFAULT_PATH)
1919
find_library(onelibd ${lib}d
20-
PATHS "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@"
20+
PATHS "@PACKAGE_INSTALL_LIBDIR@"
2121
NO_DEFAULT_PATH)
2222
if(onelib-NOTFOUND AND onelibd-NOTFOUND)
2323
message(FATAL_ERROR "Library '${lib}' in package @PKG_NAME@ is not installed properly")

0 commit comments

Comments
 (0)