revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

CMake: Fix compatibility with CMake 3.13.

Browse source 
The syntax "if(DEFINED CACHE{FOO})" requires CMake 3.14.
In some other places the code treats the cache variables
like normal variables already (${FOO} or if(FOO) is used,
not ${CACHE{FOO}).

Thanks to ygrek for reporting the bug on IRC.
This commit is contained in:
Lasse Collin 2020-11-17 20:51:48 +02:00
parent 5af726a792
commit 2f108abb3d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -127,7 +127,7 @@ tuklib_integer(ALL)
# Check for clock_gettime(). Do this before checking for threading so # Check for clock_gettime(). Do this before checking for threading so
# that we know there if CLOCK_MONOTONIC is available. # that we know there if CLOCK_MONOTONIC is available.
if(NOT WIN32 AND NOT DEFINED CACHE{HAVE_CLOCK_GETTIME}) if(NOT WIN32 AND NOT DEFINED HAVE_CLOCK_GETTIME)
check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME) check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
if(NOT HAVE_CLOCK_GETTIME) if(NOT HAVE_CLOCK_GETTIME)
# With glibc <= 2.17 or Solaris 10 this needs librt. # With glibc <= 2.17 or Solaris 10 this needs librt.

4
cmake/tuklib_cpucores.cmake
View file

@ -154,12 +154,12 @@ function(tuklib_cpucores_internal_check)
endfunction() endfunction()
function(tuklib_cpucores TARGET_OR_ALL) function(tuklib_cpucores TARGET_OR_ALL)
if(NOT DEFINED CACHE{TUKLIB_CPUCORES_FOUND}) if(NOT DEFINED TUKLIB_CPUCORES_FOUND)
message(STATUS message(STATUS
"Checking how to detect the number of available CPU cores") "Checking how to detect the number of available CPU cores")
tuklib_cpucores_internal_check() tuklib_cpucores_internal_check()
if(DEFINED CACHE{TUKLIB_CPUCORES_DEFINITIONS}) if(DEFINED TUKLIB_CPUCORES_DEFINITIONS)
set(TUKLIB_CPUCORES_FOUND 1 CACHE INTERNAL "") set(TUKLIB_CPUCORES_FOUND 1 CACHE INTERNAL "")
else() else()
set(TUKLIB_CPUCORES_FOUND 0 CACHE INTERNAL "") set(TUKLIB_CPUCORES_FOUND 0 CACHE INTERNAL "")

4
cmake/tuklib_physmem.cmake
View file

@ -130,11 +130,11 @@ function(tuklib_physmem_internal_check)
endfunction() endfunction()
function(tuklib_physmem TARGET_OR_ALL) function(tuklib_physmem TARGET_OR_ALL)
if(NOT DEFINED CACHE{TUKLIB_PHYSMEM_FOUND}) if(NOT DEFINED TUKLIB_PHYSMEM_FOUND)
message(STATUS "Checking how to detect the amount of physical memory") message(STATUS "Checking how to detect the amount of physical memory")
tuklib_physmem_internal_check() tuklib_physmem_internal_check()
if(DEFINED CACHE{TUKLIB_PHYSMEM_DEFINITIONS}) if(DEFINED TUKLIB_PHYSMEM_DEFINITIONS)
set(TUKLIB_PHYSMEM_FOUND 1 CACHE INTERNAL "") set(TUKLIB_PHYSMEM_FOUND 1 CACHE INTERNAL "")
else() else()
set(TUKLIB_PHYSMEM_FOUND 0 CACHE INTERNAL "") set(TUKLIB_PHYSMEM_FOUND 0 CACHE INTERNAL "")