mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

GNUInstallDirs: Set UNINITALIZED cache properties to type PATH

Browse Source 
Also convert the path to a cmake path
This commit is contained in:
Roger Leigh
2016-12-09 21:36:55 +00:00
committed by Roger Leigh
parent c968213d2e
commit 53b5d6345d
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/GNUInstallDirs.cmake
View File

@@ -120,11 +120,26 @@
# allow users who create additional path variables to also compute
# absolute paths where necessary, using the same logic.
# Convert a cache variable to PATH type
macro(_GNUInstallDirs_cache_convert_to_path var description)
get_property(_GNUInstallDirs_cache_type CACHE ${var} PROPERTY TYPE)
if(_GNUInstallDirs_cache_type STREQUAL "UNINITIALIZED")
file(TO_CMAKE_PATH "${${var}}" _GNUInstallDirs_cmakepath)
set_property(CACHE ${var} PROPERTY TYPE PATH)
set_property(CACHE ${var} PROPERTY VALUE "${_GNUInstallDirs_cmakepath}")
set_property(CACHE ${var} PROPERTY HELPSTRING "${description}")
unset(_GNUInstallDirs_cmakepath)
endif()
unset(_GNUInstallDirs_cache_type)
endmacro()
# Create a cache variable with default for a path.
macro(_GNUInstallDirs_cache_path var default description)
if(NOT DEFINED ${var})
set(${var} "${default}" CACHE PATH "${description}")
endif()
_GNUInstallDirs_cache_convert_to_path("${var}" "${description}")
endmacro()
# Create a cache variable with not default for a path, with a fallback
@@ -135,6 +150,7 @@ macro(_GNUInstallDirs_cache_path_fallback var default description)
set(${var} "" CACHE PATH "${description}")
set(${var} "${default}")
endif()
_GNUInstallDirs_cache_convert_to_path("${var}" "${description}")
endmacro()
# Installation directories
@@ -232,6 +248,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}")
endif()
endif()
_GNUInstallDirs_cache_convert_to_path(CMAKE_INSTALL_LIBDIR "Object code libraries (lib)")
# Save for next run
set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run")