Skip to content

Commit 9d73b51

Browse files
committed
Update CMake config paths to be modern
1 parent 5968b3f commit 9d73b51

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

src/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ if(LIBTCODFOV_INSTALL)
5454
COMPONENT Library
5555
)
5656
include(CMakePackageConfigHelpers)
57-
get_filename_component(
58-
INSTALL_FULL_INCLUDEDIR
59-
${CMAKE_INSTALL_INCLUDEDIR}
60-
REALPATH BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}
61-
)
6257
install(
6358
EXPORT ${PROJECT_NAME}Targets
6459
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
@@ -67,7 +62,8 @@ if(LIBTCODFOV_INSTALL)
6762
configure_package_config_file(${PROJECT_NAME}Config.cmake.in
6863
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
6964
INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
70-
PATH_VARS INSTALL_FULL_INCLUDEDIR)
65+
PATH_VARS CMAKE_INSTALL_INCLUDEDIR
66+
)
7167
write_basic_package_version_file(
7268
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
7369
COMPATIBILITY SameMajorVersion

src/libtcod-fovConfig.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@PACKAGE_INIT@
22

3-
set_and_check(LIBTCODFOV_INCLUDE_DIR "@PACKAGE_INSTALL_FULL_INCLUDEDIR@")
3+
set_and_check(LIBTCODFOV_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
44

55
include(${CMAKE_CURRENT_LIST_DIR}/libtcod-fovTargets.cmake)
66

7-
target_include_directories(libtcod-fov::libtcod-fov INTERFACE "@PACKAGE_INSTALL_FULL_INCLUDEDIR@")
7+
target_include_directories(libtcod-fov::libtcod-fov INTERFACE ${LIBTCODFOV_INCLUDE_DIR})
88

99
set(LIBTCODFOV_LIBRARY libtcod-fov::libtcod-fov)
1010

0 commit comments

Comments
 (0)