tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: unset temporary CMake variables 

Also use consistent case (for `_*_SEARCH_DIRS`).
This commit is contained in:
Campbell Barton 2024-03-08 10:53:03 +11:00
parent 9dd3f74c85
commit 5214e6f35d
37 changed files with 118 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/Modules/FindAudaspace.cmake
View File

@ -111,3 +111,5 @@ mark_as_advanced(
AUDASPACE_PY_INCLUDE_DIR
AUDASPACE_PY_INCLUDE_DIRS
)
unset(_audaspace_SEARCH_DIRS)

2
build_files/cmake/Modules/FindBlosc.cmake
View File

@ -64,3 +64,5 @@ mark_as_advanced(
BLOSC_INCLUDE_DIR
BLOSC_LIBRARY
)
unset(_blosc_SEARCH_DIRS)

10
build_files/cmake/Modules/FindBrotli.cmake
View File

@ -21,7 +21,7 @@ else()
set(BROTLI_ROOT_DIR "")
endif()
set(_BROTLI_SEARCH_DIRS
set(_brotli_SEARCH_DIRS
${BROTLI_ROOT_DIR}
)
@ -29,7 +29,7 @@ find_path(BROTLI_INCLUDE_DIR
NAMES
brotli/decode.h
HINTS
${_BROTLI_SEARCH_DIRS}
${_brotli_SEARCH_DIRS}
PATH_SUFFIXES
include
DOC "Brotli header files"
@ -41,7 +41,7 @@ find_library(BROTLI_LIBRARY_COMMON
brotlicommon-static
brotlicommon
HINTS
${_BROTLI_SEARCH_DIRS}
${_brotli_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib lib/static
DOC "Brotli static common library"
@ -52,7 +52,7 @@ find_library(BROTLI_LIBRARY_DEC
brotlidec-static
brotlidec
HINTS
${_BROTLI_SEARCH_DIRS}
${_brotli_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib lib/static
DOC "Brotli static decode library"
@ -81,4 +81,4 @@ mark_as_advanced(
BROTLI_LIBRARY_DIR
)
unset(_BROTLI_SEARCH_DIRS)
unset(_brotli_SEARCH_DIRS)

26
build_files/cmake/Modules/FindClang.cmake
View File

@ -36,7 +36,7 @@ if(NOT LLVM_ROOT_DIR)
set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
endif()
set(_CLANG_SEARCH_DIRS
set(_clang_SEARCH_DIRS
${CLANG_ROOT_DIR}
${LLVM_ROOT_DIR}
/opt/lib/clang
@ -46,14 +46,14 @@ find_path(CLANG_INCLUDE_DIR
NAMES
AST/AST.h
HINTS
${_CLANG_SEARCH_DIRS}
${_clang_SEARCH_DIRS}
PATH_SUFFIXES
include
include/clang
)
set(_CLANG_FIND_COMPONENTS
set(_clang_FIND_COMPONENTS
clangDependencyScanning
clangDynamicASTMatchers
clangFrontendTool
@ -87,20 +87,20 @@ set(_CLANG_FIND_COMPONENTS
clangBasic
)
set(_CLANG_LIBRARIES)
foreach(COMPONENT ${_CLANG_FIND_COMPONENTS})
set(_clang_LIBRARIES)
foreach(COMPONENT ${_clang_FIND_COMPONENTS})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
find_library(CLANG_${UPPERCOMPONENT}_LIBRARY
NAMES
${COMPONENT}
HINTS
${_CLANG_SEARCH_DIRS}
${_clang_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib
)
if(CLANG_${UPPERCOMPONENT}_LIBRARY)
list(APPEND _CLANG_LIBRARIES "${CLANG_${UPPERCOMPONENT}_LIBRARY}")
list(APPEND _clang_LIBRARIES "${CLANG_${UPPERCOMPONENT}_LIBRARY}")
endif()
endforeach()
@ -109,10 +109,10 @@ endforeach()
# all listed variables are TRUE.
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Clang DEFAULT_MSG
_CLANG_LIBRARIES CLANG_INCLUDE_DIR)
_clang_LIBRARIES CLANG_INCLUDE_DIR)
if(CLANG_FOUND)
set(CLANG_LIBRARIES ${_CLANG_LIBRARIES})
set(CLANG_LIBRARIES ${_clang_LIBRARIES})
set(CLANG_INCLUDE_DIRS ${CLANG_INCLUDE_DIR})
endif()
@ -120,11 +120,11 @@ mark_as_advanced(
CLANG_INCLUDE_DIR
)
foreach(COMPONENT ${_CLANG_FIND_COMPONENTS})
foreach(COMPONENT ${_clang_FIND_COMPONENTS})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
mark_as_advanced(CLANG_${UPPERCOMPONENT}_LIBRARY)
endforeach()
unset(_CLANG_SEARCH_DIRS)
unset(_CLANG_FIND_COMPONENTS)
unset(_CLANG_LIBRARIES)
unset(_clang_SEARCH_DIRS)
unset(_clang_FIND_COMPONENTS)
unset(_clang_LIBRARIES)

2
build_files/cmake/Modules/FindClangTidy.cmake
View File

@ -104,3 +104,5 @@ ${CLANG_TIDY_VERSION_PATCH}")
else()
set(CLANG_TIDY_FOUND FALSE)
endif()
unset(_clang_tidy_SEARCH_DIRS)

2
build_files/cmake/Modules/FindEigen3.cmake
View File

@ -47,3 +47,5 @@ endif()
mark_as_advanced(
EIGEN3_INCLUDE_DIR
)
unset(_eigen3_SEARCH_DIRS)

2
build_files/cmake/Modules/FindFFmpeg.cmake
View File

@ -66,6 +66,8 @@ foreach(_component ${FFMPEG_FIND_COMPONENTS})
list(APPEND _ffmpeg_LIBRARIES ${FFMPEG_${_upper_COMPONENT}_LIBRARY})
mark_as_advanced(FFMPEG_${_upper_COMPONENT}_LIBRARY)
endforeach()
unset(_component)
unset(_upper_COMPONENT)
# handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if
# all listed variables are TRUE

4
build_files/cmake/Modules/FindFftw3.cmake
View File

@ -72,10 +72,12 @@ if(FFTW3_FOUND)
set(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
endif()
unset(_FFTW3_LIBRARIES)
mark_as_advanced(
FFTW3_INCLUDE_DIR
FFTW3_LIBRARY_F
FFTW3_LIBRARY_D
)
unset(_FFTW3_LIBRARIES)
unset(_fftw3_SEARCH_DIRS)

2
build_files/cmake/Modules/FindFribidi.cmake
View File

@ -55,3 +55,5 @@ MARK_AS_ADVANCED(
LIBFRIBIDI_INCLUDE_DIR
LIBFRIBIDI_LIBRARY
)
unset(_fribidi_SEARCH_DIRS)

2
build_files/cmake/Modules/FindGMP.cmake
View File

@ -91,3 +91,5 @@ mark_as_advanced(
GMPXX_INCLUDE_DIR
GMPXX_LIBRARY
)
unset(_gmp_SEARCH_DIRS)

2
build_files/cmake/Modules/FindHIP.cmake
View File

@ -101,3 +101,5 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(HIP
REQUIRED_VARS HIP_HIPCC_EXECUTABLE
VERSION_VAR HIP_VERSION)
unset(_hip_SEARCH_DIRS)

2
build_files/cmake/Modules/FindHIPRT.cmake
View File

@ -57,3 +57,5 @@ find_package_handle_standard_args(HIPRT DEFAULT_MSG
mark_as_advanced(
HIPRT_INCLUDE_DIR
)
unset(_hiprt_SEARCH_DIRS)

2
build_files/cmake/Modules/FindHarfbuzz.cmake
View File

@ -55,3 +55,5 @@ MARK_AS_ADVANCED(
LIBHARFBUZZ_INCLUDE_DIR
LIBHARFBUZZ_LIBRARY
)
unset(_harfbuzz_SEARCH_DIRS)

2
build_files/cmake/Modules/FindIcuLinux.cmake
View File

@ -137,3 +137,5 @@ mark_as_advanced(
ICU_LIBRARY_TU
ICU_LIBRARY_UC
)
unset(_icu_SEARCH_DIRS)

2
build_files/cmake/Modules/FindJack.cmake
View File

@ -61,3 +61,5 @@ mark_as_advanced(
JACK_INCLUDE_DIR
JACK_LIBRARY
)
unset(_jack_SEARCH_DIRS)

2
build_files/cmake/Modules/FindJeMalloc.cmake
View File

@ -71,3 +71,5 @@ mark_as_advanced(
JEMALLOC_INCLUDE_DIR
JEMALLOC_LIBRARY
)
unset(_jemalloc_SEARCH_DIRS)

2
build_files/cmake/Modules/FindLZO.cmake
View File

@ -59,3 +59,5 @@ mark_as_advanced(
LZO_INCLUDE_DIR
LZO_LIBRARY
)
unset(_lzo_SEARCH_DIRS)

8
build_files/cmake/Modules/FindLevelZero.cmake
View File

@ -20,7 +20,7 @@ else()
set(LEVEL_ZERO_ROOT_DIR "")
endif()
set(_level_zero_search_dirs
set(_level_zero_SEARCH_DIRS
${LEVEL_ZERO_ROOT_DIR}
/usr/lib
/usr/local/lib
@ -30,7 +30,7 @@ find_library(LEVEL_ZERO_LIBRARY
NAMES
ze_loader
HINTS
${_level_zero_search_dirs}
${_level_zero_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib
)
@ -39,7 +39,7 @@ find_path(LEVEL_ZERO_INCLUDE_DIR
NAMES
level_zero/ze_api.h
HINTS
${_level_zero_search_dirs}
${_level_zero_SEARCH_DIRS}
PATH_SUFFIXES
include
)
@ -60,3 +60,5 @@ mark_as_advanced(
LEVEL_ZERO_LIBRARY
LEVEL_ZERO_INCLUDE_DIR
)
unset(_level_zero_SEARCH_DIRS)

8
build_files/cmake/Modules/FindOSL.cmake
View File

@ -125,7 +125,15 @@ mark_as_advanced(
OSL_INCLUDE_DIR
OSL_SHADER_DIR
)
foreach(COMPONENT ${_osl_FIND_COMPONENTS})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
mark_as_advanced(OSL_${UPPERCOMPONENT}_LIBRARY)
endforeach()
unset(COMPONENT)
unset(UPPERCOMPONENT)
unset(_osl_FIND_COMPONENTS)
unset(_osl_LIBRARIES)
unset(_osl_SEARCH_DIRS)

6
build_files/cmake/Modules/FindOpenCOLLADA.cmake
View File

@ -134,5 +134,9 @@ endif()
unset(COMPONENT)
unset(UPPERCOMPONENT)
unset(_opencollada_LIBRARIES)
unset(_opencollada_FIND_COMPONENTS)
unset(_opencollada_FIND_INCLUDES)
unset(_opencollada_FIND_STATIC_COMPONENTS)
unset(_opencollada_INCLUDES)
unset(_opencollada_LIBRARIES)
unset(_opencollada_SEARCH_DIRS)

1
build_files/cmake/Modules/FindOpenColorIO.cmake
View File

@ -72,6 +72,7 @@ if(EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h")
REGEX "^#define OCIO_VERSION[ \t].*$")
endif()
string(REGEX MATCHALL "[0-9]+[.0-9]+" OPENCOLORIO_VERSION ${_opencolorio_version})
unset(_opencolorio_version)
endif()
# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if

6
build_files/cmake/Modules/FindOpenImageDenoise.cmake
View File

@ -119,6 +119,10 @@ foreach(COMPONENT ${_openimagedenoise_FIND_COMPONENTS})
mark_as_advanced(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY)
endforeach()
unset(_openimagedenoise_SEARCH_DIRS)
unset(COMPONENT)
unset(UPPERCOMPONENT)
unset(_openimagedenoise_FIND_COMPONENTS)
unset(_openimagedenoise_FIND_STATIC_COMPONENTS)
unset(_openimagedenoise_LIBRARIES)
unset(_openimagedenoise_SEARCH_DIRS)

7
build_files/cmake/Modules/FindOpenSubdiv.cmake
View File

@ -85,3 +85,10 @@ foreach(COMPONENT ${_opensubdiv_FIND_COMPONENTS})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
mark_as_advanced(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY)
endforeach()
unset(COMPONENT)
unset(UPPERCOMPONENT)
unset(_opensubdiv_FIND_COMPONENTS)
unset(_opensubdiv_SEARCH_DIRS)
unset(_opensubdiv_LIBRARIES)

2
build_files/cmake/Modules/FindPCRE.cmake
View File

@ -64,3 +64,5 @@ mark_as_advanced(
PCRE_INCLUDE_DIR
PCRE_LIBRARY
)
unset(_pcre_SEARCH_DIRS)

2
build_files/cmake/Modules/FindPotrace.cmake
View File

@ -64,3 +64,5 @@ mark_as_advanced(
POTRACE_INCLUDE_DIR
POTRACE_LIBRARY
)
unset(_potrace_SEARCH_DIRS)

2
build_files/cmake/Modules/FindPugiXML.cmake
View File

@ -64,3 +64,5 @@ mark_as_advanced(
PUGIXML_INCLUDE_DIR
PUGIXML_LIBRARY
)
unset(_pugixml_SEARCH_DIRS)

2
build_files/cmake/Modules/FindPulse.cmake
View File

@ -59,3 +59,5 @@ mark_as_advanced(
LIBPULSE_INCLUDE_DIR
LIBPULSE_LIBRARY
)
unset(_pulse_SEARCH_DIRS)

8
build_files/cmake/Modules/FindPythonLibsUnix.cmake
View File

@ -256,10 +256,6 @@ if(PYTHONLIBSUNIX_FOUND)
)
endif()
unset(_PYTHON_ABI_FLAGS)
unset(_PYTHON_VERSION_SUPPORTED)
unset(_python_SEARCH_DIRS)
mark_as_advanced(
PYTHON_INCLUDE_DIR
PYTHON_INCLUDE_CONFIG_DIR
@ -268,3 +264,7 @@ mark_as_advanced(
PYTHON_SITE_PACKAGES
PYTHON_EXECUTABLE
)
unset(_PYTHON_ABI_FLAGS)
unset(_PYTHON_VERSION_SUPPORTED)
unset(_python_SEARCH_DIRS)

2
build_files/cmake/Modules/FindSDL2.cmake
View File

@ -60,3 +60,5 @@ mark_as_advanced(
SDL2_INCLUDE_DIR
SDL2_LIBRARY
)
unset(_sdl2_SEARCH_DIRS)

14
build_files/cmake/Modules/FindSYCL.cmake
View File

@ -22,7 +22,7 @@ elseif(DEFINED ENV{SYCL_ROOT_DIR} AND NOT $ENV{SYCL_ROOT_DIR} STREQUAL "")
set(SYCL_ROOT_DIR $ENV{SYCL_ROOT_DIR})
endif()
set(_sycl_search_dirs
set(_sycl_SEARCH_DIRS
${SYCL_ROOT_DIR}
/usr/lib
/usr/local/lib
@ -41,7 +41,7 @@ find_program(SYCL_COMPILER
dpcpp
clang++
HINTS
${_sycl_search_dirs}
${_sycl_SEARCH_DIRS}
PATH_SUFFIXES
bin
NO_CMAKE_FIND_ROOT_PATH
@ -56,7 +56,7 @@ if(NOT SYCL_COMPILER)
icpx
dpcpp
HINTS
${_sycl_search_dirs}
${_sycl_SEARCH_DIRS}
PATH_SUFFIXES
bin
)
@ -68,7 +68,7 @@ find_library(SYCL_LIBRARY
sycl6
sycl
HINTS
${_sycl_search_dirs}
${_sycl_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib
)
@ -80,7 +80,7 @@ if(WIN32)
sycl6d
sycld
HINTS
${_sycl_search_dirs}
${_sycl_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib
)
@ -90,7 +90,7 @@ find_path(SYCL_INCLUDE_DIR
NAMES
sycl/sycl.hpp
HINTS
${_sycl_search_dirs}
${_sycl_SEARCH_DIRS}
PATH_SUFFIXES
include
)
@ -129,3 +129,5 @@ mark_as_advanced(
SYCL_INCLUDE_DIR
SYCL_LIBRARY
)
unset(_sycl_SEARCH_DIRS)

2
build_files/cmake/Modules/FindSndFile.cmake
View File

@ -59,3 +59,5 @@ mark_as_advanced(
LIBSNDFILE_INCLUDE_DIR
LIBSNDFILE_LIBRARY
)
unset(_sndfile_SEARCH_DIRS)

2
build_files/cmake/Modules/FindSpacenav.cmake
View File

@ -61,3 +61,5 @@ mark_as_advanced(
SPACENAV_INCLUDE_DIR
SPACENAV_LIBRARY
)
unset(_spacenav_SEARCH_DIRS)

2
build_files/cmake/Modules/FindTBB.cmake
View File

@ -64,3 +64,5 @@ mark_as_advanced(
TBB_INCLUDE_DIR
TBB_LIBRARY
)
unset(_tbb_SEARCH_DIRS)

4
build_files/cmake/Modules/FindWebP.cmake
View File

@ -89,3 +89,7 @@ mark_as_advanced(
WEBP_WEBP_LIBRARY
WEBP_SHARPYUV_LIBRARY
)
unset(_webp_FIND_COMPONENTS)
unset(_webp_LIBRARIES)
unset(_webp_SEARCH_DIRS)

2
build_files/cmake/Modules/FindXML2.cmake
View File

@ -59,3 +59,5 @@ mark_as_advanced(
XML2_INCLUDE_DIR
XML2_LIBRARY
)
unset(_xml2_SEARCH_DIRS)

2
build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake
View File

@ -70,3 +70,5 @@ mark_as_advanced(
XR_OPENXR_SDK_INCLUDE_DIR
XR_OPENXR_SDK_LOADER_LIBRARY
)
unset(_xr_openxr_sdk_SEARCH_DIRS)

2
build_files/cmake/Modules/FindZstd.cmake
View File

@ -61,3 +61,5 @@ mark_as_advanced(
ZSTD_INCLUDE_DIR
ZSTD_LIBRARY
)
unset(_zstd_SEARCH_DIRS)