diff options
Diffstat (limited to 'build_files/cmake/Modules')
31 files changed, 237 insertions, 31 deletions
diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index aba91bb565d..18214b25c8f 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_IN IF(ALEMBIC_FOUND) SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY}) SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR}) -ENDIF(ALEMBIC_FOUND) +ENDIF() MARK_AS_ADVANCED( ALEMBIC_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake index 9bf15e05272..07ce2ba33d0 100644 --- a/build_files/cmake/Modules/FindAudaspace.cmake +++ b/build_files/cmake/Modules/FindAudaspace.cmake @@ -30,7 +30,7 @@ SET(_audaspace_SEARCH_DIRS FIND_PACKAGE(PkgConfig) IF(PKG_CONFIG_FOUND) PKG_CHECK_MODULES(AUDASPACE_PKGCONF audaspace) -ENDIF(PKG_CONFIG_FOUND) +ENDIF() # Include dir FIND_PATH(AUDASPACE_INCLUDE_DIR @@ -88,17 +88,17 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_Py DEFAULT_MSG AUDASPACE_PY_LIBRAR IF(AUDASPACE_FOUND) SET(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY}) SET(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR}) -ENDIF(AUDASPACE_FOUND) +ENDIF() IF(AUDASPACE_C_FOUND) SET(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY}) SET(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR}) -ENDIF(AUDASPACE_C_FOUND) +ENDIF() IF(AUDASPACE_PY_FOUND) SET(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY}) SET(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR}) -ENDIF(AUDASPACE_PY_FOUND) +ENDIF() MARK_AS_ADVANCED( AUDASPACE_LIBRARY diff --git a/build_files/cmake/Modules/FindClangTidy.cmake b/build_files/cmake/Modules/FindClangTidy.cmake index d576ad8f100..04c5dfda448 100644 --- a/build_files/cmake/Modules/FindClangTidy.cmake +++ b/build_files/cmake/Modules/FindClangTidy.cmake @@ -43,7 +43,10 @@ find_program(CLANG_TIDY_EXECUTABLE ${_clang_tidy_SEARCH_DIRS} ) -if(CLANG_TIDY_EXECUTABLE) +if(CLANG_TIDY_EXECUTABLE AND NOT EXISTS ${CLANG_TIDY_EXECUTABLE}) + message(WARNING "Cached or directly specified Clang-Tidy executable does not exist.") + set(CLANG_TIDY_FOUND FALSE) +elseif(CLANG_TIDY_EXECUTABLE) # Mark clang-tidy as found. set(CLANG_TIDY_FOUND TRUE) diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake index 735f44a04db..8b4399fdd07 100644 --- a/build_files/cmake/Modules/FindEigen3.cmake +++ b/build_files/cmake/Modules/FindEigen3.cmake @@ -41,7 +41,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG IF(EIGEN3_FOUND) SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) -ENDIF(EIGEN3_FOUND) +ENDIF() MARK_AS_ADVANCED( EIGEN3_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index 2b3cd8e20c4..0716f47ca52 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -37,9 +37,9 @@ FIND_PATH(EMBREE_INCLUDE_DIR SET(_embree_FIND_COMPONENTS embree3 + embree_sse42 embree_avx embree_avx2 - embree_sse42 lexers math simd @@ -80,7 +80,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG IF(EMBREE_FOUND) SET(EMBREE_LIBRARIES ${_embree_LIBRARIES}) SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR}) -ENDIF(EMBREE_FOUND) +ENDIF() MARK_AS_ADVANCED( EMBREE_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake new file mode 100644 index 00000000000..0765c1dc901 --- /dev/null +++ b/build_files/cmake/Modules/FindFFmpeg.cmake @@ -0,0 +1,83 @@ +# - Find FFmpeg library and includes. +# Set FFMPEG_FIND_COMPONENTS to the canonical names of the libraries +# before using the module. +# This module defines +# FFMPEG_INCLUDE_DIRS, where to find libavcodec/ac3_parser.h. +# FFMPEG_LIBRARIES, libraries to link against to use FFmpeg. +# FFMPEG_ROOT_DIR, The base directory to search for FFmpeg. +# This can also be an environment variable. +# FFMPEG_FOUND, If false, do not try to use FFmpeg. +# FFMPEG_<COMPONENT>_LIBRARY, the given individual component libraries. +#============================================================================= +# Copyright 2020 Blender Foundation. +# +# Distributed under the OSI-approved BSD 3-Clause License, +# see accompanying file BSD-3-Clause-license.txt for details. +#============================================================================= + +# If FFMPEG_ROOT_DIR was defined in the environment, use it. +if(NOT FFMPEG_ROOT_DIR AND NOT $ENV{FFMPEG_ROOT_DIR} STREQUAL "") + set(FFMPEG_ROOT_DIR $ENV{FFMPEG_ROOT_DIR}) +endif() + +set(_ffmpeg_SEARCH_DIRS + ${FFMPEG_ROOT_DIR} + /opt/lib/ffmpeg +) + +if(NOT FFMPEG_FIND_COMPONENTS) + set(FFMPEG_FIND_COMPONENTS + # List taken from http://ffmpeg.org/download.html#build-mac + avcodec + avdevice + avfilter + avformat + avutil + ) +endif() + +find_path(_ffmpeg_INCLUDE_DIR + NAMES + libavcodec/ac3_parser.h + HINTS + ${_ffmpeg_SEARCH_DIRS} + PATH_SUFFIXES + include +) + +set(_ffmpeg_LIBRARIES) +foreach(_component ${FFMPEG_FIND_COMPONENTS}) + string(TOUPPER ${_component} _upper_COMPONENT) + find_library(FFMPEG_${_upper_COMPONENT}_LIBRARY + NAMES + ${_upper_COMPONENT} + HINTS + ${LIBDIR}/ffmpeg + PATH_SUFFIXES + lib64 lib + ) + if(NOT FFMPEG_${_upper_COMPONENT}_LIBRARY) + message(WARNING "Could NOT find FFmpeg ${_upper_COMPONENT}.") + endif() + list(APPEND _ffmpeg_LIBRARIES ${FFMPEG_${_upper_COMPONENT}_LIBRARY}) + mark_as_advanced(FFMPEG_${_upper_COMPONENT}_LIBRARY) +endforeach() + +# handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(FFmpeg DEFAULT_MSG + _ffmpeg_LIBRARIES _ffmpeg_INCLUDE_DIR) + +IF(FFMPEG_FOUND) + set(FFMPEG_LIBRARIES ${_ffmpeg_LIBRARIES}) + set(FFMPEG_INCLUDE_DIRS ${_ffmpeg_INCLUDE_DIR}) +ENDIF() + +mark_as_advanced( + FFMPEG_INCLUDE_DIR +) + +unset(_ffmpeg_SEARCH_DIRS) +unset(_ffmpeg_LIBRARIES) +unset(_ffmpeg_INCLUDE_DIR) diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index df69c0c2ed4..bce22d21e8c 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -54,7 +54,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG IF(FFTW3_FOUND) SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY}) SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR}) -ENDIF(FFTW3_FOUND) +ENDIF() MARK_AS_ADVANCED( FFTW3_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 059b1da005d..759065d751c 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG IF(GLEW_FOUND) SET(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR}) -ENDIF(GLEW_FOUND) +ENDIF() MARK_AS_ADVANCED( GLEW_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindGMP.cmake b/build_files/cmake/Modules/FindGMP.cmake index a06b8737648..03ada24403b 100644 --- a/build_files/cmake/Modules/FindGMP.cmake +++ b/build_files/cmake/Modules/FindGMP.cmake @@ -82,7 +82,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG IF(GMP_FOUND) SET(GMP_LIBRARIES ${GMPXX_LIBRARY} ${GMP_LIBRARY}) SET(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR} ${GMPXX_INCLUDE_DIR}) -ENDIF(GMP_FOUND) +ENDIF() MARK_AS_ADVANCED( GMP_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index e1aaa434533..46e76fface2 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -124,7 +124,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG IF(ICU_FOUND) SET(ICU_LIBRARIES ${ICU_LIBRARY_DATA} ${ICU_LIBRARY_I18N} ${ICU_LIBRARY_IO} ${ICU_LIBRARY_LE} ${ICU_LIBRARY_LX} ${ICU_LIBRARY_TU} ${ICU_LIBRARY_UC}) SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) -ENDIF(ICU_FOUND) +ENDIF() MARK_AS_ADVANCED( ICU_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index a790c127c09..82ce890730d 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -54,7 +54,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG IF(JACK_FOUND) SET(JACK_LIBRARIES ${JACK_LIBRARY}) SET(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR}) -ENDIF(JACK_FOUND) +ENDIF() MARK_AS_ADVANCED( JACK_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index 72a0bed6f22..7473c023cc7 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -64,7 +64,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG IF(JEMALLOC_FOUND) SET(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY}) SET(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR}) -ENDIF(JEMALLOC_FOUND) +ENDIF() MARK_AS_ADVANCED( JEMALLOC_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindLLVM.cmake b/build_files/cmake/Modules/FindLLVM.cmake index d7269a4281f..ce4297bf54a 100644 --- a/build_files/cmake/Modules/FindLLVM.cmake +++ b/build_files/cmake/Modules/FindLLVM.cmake @@ -34,6 +34,10 @@ else() endif() endif() +execute_process(COMMAND ${LLVM_CONFIG} --includedir + OUTPUT_VARIABLE LLVM_INCLUDE_DIRS + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT DEFINED LLVM_VERSION) execute_process(COMMAND ${LLVM_CONFIG} --version OUTPUT_VARIABLE LLVM_VERSION @@ -80,7 +84,7 @@ if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH) endif() -# handle the QUIETLY and REQUIRED arguments and set SDL2_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set LLVM_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LLVM DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index 81f8792a803..8a2cce5e181 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG IF(LZO_FOUND) SET(LZO_LIBRARIES ${LZO_LIBRARY}) SET(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR}) -ENDIF(LZO_FOUND) +ENDIF() MARK_AS_ADVANCED( LZO_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindNanoVDB.cmake b/build_files/cmake/Modules/FindNanoVDB.cmake new file mode 100644 index 00000000000..95d76fb39af --- /dev/null +++ b/build_files/cmake/Modules/FindNanoVDB.cmake @@ -0,0 +1,49 @@ +# - Find NanoVDB library +# Find the native NanoVDB includes and library +# This module defines +# NANOVDB_INCLUDE_DIRS, where to find nanovdb.h, Set when +# NANOVDB_INCLUDE_DIR is found. +# NANOVDB_ROOT_DIR, The base directory to search for NanoVDB. +# This can also be an environment variable. +# NANOVDB_FOUND, If false, do not try to use NanoVDB. + +#============================================================================= +# Copyright 2020 Blender Foundation. +# +# Distributed under the OSI-approved BSD 3-Clause License, +# see accompanying file BSD-3-Clause-license.txt for details. +#============================================================================= + +# If NANOVDB_ROOT_DIR was defined in the environment, use it. +IF(NOT NANOVDB_ROOT_DIR AND NOT $ENV{NANOVDB_ROOT_DIR} STREQUAL "") + SET(NANOVDB_ROOT_DIR $ENV{NANOVDB_ROOT_DIR}) +ENDIF() + +SET(_nanovdb_SEARCH_DIRS + ${NANOVDB_ROOT_DIR} +) + +FIND_PATH(NANOVDB_INCLUDE_DIR + NAMES + nanovdb/NanoVDB.h + HINTS + ${_nanovdb_SEARCH_DIRS} + PATH_SUFFIXES + include +) + +# handle the QUIETLY and REQUIRED arguments and set NANOVDB_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(NanoVDB DEFAULT_MSG + NANOVDB_INCLUDE_DIR) + +IF(NANOVDB_FOUND) + SET(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR}) +ENDIF(NANOVDB_FOUND) + +MARK_AS_ADVANCED( + NANOVDB_INCLUDE_DIR +) + +UNSET(_nanovdb_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOSL.cmake b/build_files/cmake/Modules/FindOSL.cmake index f22fe32c994..d184215ac9f 100644 --- a/build_files/cmake/Modules/FindOSL.cmake +++ b/build_files/cmake/Modules/FindOSL.cmake @@ -95,7 +95,7 @@ IF(OSL_FOUND) "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR}) STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*" "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR}) -ENDIF(OSL_FOUND) +ENDIF() MARK_AS_ADVANCED( OSL_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index cc940b76382..00898923fbd 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -129,7 +129,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA DEFAULT_MSG IF(OPENCOLLADA_FOUND) SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES}) SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES}) -ENDIF(OPENCOLLADA_FOUND) +ENDIF() UNSET(COMPONENT) UNSET(UPPERCOMPONENT) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index 559ccaba865..5c0ad89a0b7 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -70,7 +70,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO DEFAULT_MSG IF(OPENCOLORIO_FOUND) SET(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES}) SET(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_INCLUDE_DIR}) -ENDIF(OPENCOLORIO_FOUND) +ENDIF() MARK_AS_ADVANCED( OPENCOLORIO_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index ddd98237dd0..94c175dcb0f 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -65,7 +65,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenJPEG DEFAULT_MSG IF(OPENJPEG_FOUND) SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) SET(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) -ENDIF(OPENJPEG_FOUND) +ENDIF() MARK_AS_ADVANCED( OPENJPEG_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake index 312540645dc..ec52b9e0310 100644 --- a/build_files/cmake/Modules/FindOpenSubdiv.cmake +++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake @@ -90,7 +90,7 @@ IF(OPENSUBDIV_FOUND) OPENSUBDIV_CHECK_CONTROLLER("cudaEvaluator.h" OPENSUBDIV_HAS_CUDA) OPENSUBDIV_CHECK_CONTROLLER("glXFBEvaluator.h" OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) OPENSUBDIV_CHECK_CONTROLLER("glComputeEvaluator.h" OPENSUBDIV_HAS_GLSL_COMPUTE) -ENDIF(OPENSUBDIV_FOUND) +ENDIF() MARK_AS_ADVANCED( OPENSUBDIV_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake index 1c7d955d1d4..3d135d7c87b 100644 --- a/build_files/cmake/Modules/FindOpenVDB.cmake +++ b/build_files/cmake/Modules/FindOpenVDB.cmake @@ -55,7 +55,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG IF(OPENVDB_FOUND) SET(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY}) SET(OPENVDB_INCLUDE_DIRS ${OPENVDB_INCLUDE_DIR}) -ENDIF(OPENVDB_FOUND) +ENDIF() MARK_AS_ADVANCED( OPENVDB_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOptiX.cmake b/build_files/cmake/Modules/FindOptiX.cmake index 2cb1ce09e46..cfcdd9cd23b 100644 --- a/build_files/cmake/Modules/FindOptiX.cmake +++ b/build_files/cmake/Modules/FindOptiX.cmake @@ -41,7 +41,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OptiX DEFAULT_MSG IF(OPTIX_FOUND) SET(OPTIX_INCLUDE_DIRS ${OPTIX_INCLUDE_DIR}) -ENDIF(OPTIX_FOUND) +ENDIF() MARK_AS_ADVANCED( OPTIX_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index 678826e4ab1..70b95e54d16 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -57,7 +57,7 @@ SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) IF(PCRE_FOUND) SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) -ENDIF(PCRE_FOUND) +ENDIF() MARK_AS_ADVANCED( PCRE_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindPotrace.cmake b/build_files/cmake/Modules/FindPotrace.cmake new file mode 100644 index 00000000000..891a903af9f --- /dev/null +++ b/build_files/cmake/Modules/FindPotrace.cmake @@ -0,0 +1,65 @@ +# - Find potrace library +# Find the potrace include and library +# This module defines +# POTRACE_INCLUDE_DIRS, where to find potracelib.h, Set when +# POTRACE is found. +# POTRACE_LIBRARIES, libraries to link against to use POTRACE. +# POTRACE_ROOT_DIR, The base directory to search for POTRACE. +# This can also be an environment variable. +# POTRACE_FOUND, If false, do not try to use POTRACE. +# +# also defined, but not for general use are +# POTRACE_LIBRARY, where to find the POTRACE library. + +#============================================================================= +# Copyright 2020 Blender Foundation. +# +# Distributed under the OSI-approved BSD 3-Clause License, +# see accompanying file BSD-3-Clause-license.txt for details. +#============================================================================= + +# If POTRACE_ROOT_DIR was defined in the environment, use it. +IF(NOT POTRACE_ROOT_DIR AND NOT $ENV{POTRACE_ROOT_DIR} STREQUAL "") + SET(POTRACE_ROOT_DIR $ENV{POTRACE_ROOT_DIR}) +ENDIF() + +SET(_potrace_SEARCH_DIRS + ${POTRACE_ROOT_DIR} + /opt/lib/potrace + /usr/include + /usr/local/include +) + +FIND_PATH(POTRACE_INCLUDE_DIR + NAMES + potracelib.h + HINTS + ${_potrace_SEARCH_DIRS} + PATH_SUFFIXES + include +) + +FIND_LIBRARY(POTRACE_LIBRARY + NAMES + potrace + HINTS + ${_potrace_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib + ) + +# handle the QUIETLY and REQUIRED arguments and set POTRACE_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Potrace DEFAULT_MSG + POTRACE_LIBRARY POTRACE_INCLUDE_DIR) + +IF(POTRACE_FOUND) + SET(POTRACE_LIBRARIES ${POTRACE_LIBRARY}) + SET(POTRACE_INCLUDE_DIRS ${POTRACE_INCLUDE_DIR}) +ENDIF() + +MARK_AS_ADVANCED( + POTRACE_INCLUDE_DIR + POTRACE_LIBRARY +) diff --git a/build_files/cmake/Modules/FindSDL2.cmake b/build_files/cmake/Modules/FindSDL2.cmake index 7ef9a84dab0..5088a348aea 100644 --- a/build_files/cmake/Modules/FindSDL2.cmake +++ b/build_files/cmake/Modules/FindSDL2.cmake @@ -53,7 +53,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 DEFAULT_MSG IF(SDL2_FOUND) SET(SDL2_LIBRARIES ${SDL2_LIBRARY}) SET(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) -ENDIF(SDL2_FOUND) +ENDIF() MARK_AS_ADVANCED( SDL2_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index aae5b692228..61f31a050c6 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG IF(SNDFILE_FOUND) SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) -ENDIF(SNDFILE_FOUND) +ENDIF() MARK_AS_ADVANCED( LIBSNDFILE_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index b7c8c01dc32..aae2e521aed 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -54,7 +54,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spacenav DEFAULT_MSG IF(SPACENAV_FOUND) SET(SPACENAV_LIBRARIES ${SPACENAV_LIBRARY}) SET(SPACENAV_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIR}) -ENDIF(SPACENAV_FOUND) +ENDIF() MARK_AS_ADVANCED( SPACENAV_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindUSD.cmake b/build_files/cmake/Modules/FindUSD.cmake index d0e772038a7..805f349387f 100644 --- a/build_files/cmake/Modules/FindUSD.cmake +++ b/build_files/cmake/Modules/FindUSD.cmake @@ -59,7 +59,7 @@ ELSE() get_filename_component(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY) SET(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR}) set(USD_LIBRARIES ${USD_LIBRARY}) - ENDIF(USD_FOUND) + ENDIF() ENDIF() MARK_AS_ADVANCED( diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index d313150f7a0..7d2d41d5a7c 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG IF(XML2_FOUND) SET(XML2_LIBRARIES ${XML2_LIBRARY}) SET(XML2_INCLUDE_DIRS ${XML2_INCLUDE_DIR}) -ENDIF(XML2_FOUND) +ENDIF() MARK_AS_ADVANCED( XML2_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake index 3e9cebdbae4..ddfbfe3fe5b 100644 --- a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake +++ b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake @@ -61,7 +61,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OpenXR_SDK DEFAULT_MSG IF(XR_OPENXR_SDK_FOUND) SET(XR_OPENXR_SDK_LIBRARIES ${XR_OPENXR_SDK_LOADER_LIBRARY}) SET(XR_OPENXR_SDK_INCLUDE_DIRS ${XR_OPENXR_SDK_INCLUDE_DIR}) -ENDIF(XR_OPENXR_SDK_FOUND) +ENDIF() MARK_AS_ADVANCED( XR_OPENXR_SDK_INCLUDE_DIR diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 053d5196f41..6406dd6aa28 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -39,6 +39,7 @@ macro(BLENDER_SRC_GTEST_EX) add_definitions(${GLOG_DEFINES}) add_executable(${TARGET_NAME} ${ARG_SRC} ${MANIFEST}) + setup_platform_linker_flags(${TARGET_NAME}) target_include_directories(${TARGET_NAME} PUBLIC "${TEST_INC}") target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${TEST_INC_SYS}") target_link_libraries(${TARGET_NAME} ${ARG_EXTRA_LIBS} ${PLATFORM_LINKLIBS}) @@ -96,6 +97,7 @@ macro(BLENDER_SRC_GTEST_EX) set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0) endif() if(WIN32) + set_target_properties(${TARGET_NAME} PROPERTIES VS_GLOBAL_VcpkgEnabled "false") unset(MANIFEST) endif() unset(TEST_INC) |