diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2020-11-17 20:51:48 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2020-11-17 21:09:39 +0200 |
| commit | 2f108abb3d82e4e2313b438dae9c0c7c7a6366f2 (patch) | |
| tree | d4e8a0dbb079bc49c2a83fb096cf0b52f540dcbf | |
| parent | Update THANKS. (diff) | |
| download | xz-2f108abb3d82e4e2313b438dae9c0c7c7a6366f2.tar.xz | |
CMake: Fix compatibility with CMake 3.13.
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.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/tuklib_cpucores.cmake | 4 | ||||
| -rw-r--r-- | cmake/tuklib_physmem.cmake | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3aa6270..c21ab567 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ tuklib_integer(ALL) # Check for clock_gettime(). Do this before checking for threading so # 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) if(NOT HAVE_CLOCK_GETTIME) # With glibc <= 2.17 or Solaris 10 this needs librt. diff --git a/cmake/tuklib_cpucores.cmake b/cmake/tuklib_cpucores.cmake index 5844e4b2..743d56b3 100644 --- a/cmake/tuklib_cpucores.cmake +++ b/cmake/tuklib_cpucores.cmake @@ -154,12 +154,12 @@ function(tuklib_cpucores_internal_check) endfunction() function(tuklib_cpucores TARGET_OR_ALL) - if(NOT DEFINED CACHE{TUKLIB_CPUCORES_FOUND}) + if(NOT DEFINED TUKLIB_CPUCORES_FOUND) message(STATUS "Checking how to detect the number of available CPU cores") tuklib_cpucores_internal_check() - if(DEFINED CACHE{TUKLIB_CPUCORES_DEFINITIONS}) + if(DEFINED TUKLIB_CPUCORES_DEFINITIONS) set(TUKLIB_CPUCORES_FOUND 1 CACHE INTERNAL "") else() set(TUKLIB_CPUCORES_FOUND 0 CACHE INTERNAL "") diff --git a/cmake/tuklib_physmem.cmake b/cmake/tuklib_physmem.cmake index ea5bcc46..f5ed8889 100644 --- a/cmake/tuklib_physmem.cmake +++ b/cmake/tuklib_physmem.cmake @@ -130,11 +130,11 @@ function(tuklib_physmem_internal_check) endfunction() 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") tuklib_physmem_internal_check() - if(DEFINED CACHE{TUKLIB_PHYSMEM_DEFINITIONS}) + if(DEFINED TUKLIB_PHYSMEM_DEFINITIONS) set(TUKLIB_PHYSMEM_FOUND 1 CACHE INTERNAL "") else() set(TUKLIB_PHYSMEM_FOUND 0 CACHE INTERNAL "") |