diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 5f90263cd21..9a862b198af 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -49,7 +49,7 @@ set(BOOST_HASH 077f074743ea7b0cb49c6ed43953ae95) set(BOOST_HASH_TYPE MD5) set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz) set(BOOST_CPE "cpe:2.3:a:boost:boost:${BOOST_VERSION}:*:*:*:*:*:*:*") -SET(BOOST_HOMEPAGE https://www.boost.org/) +set(BOOST_HOMEPAGE https://www.boost.org/) set(BLOSC_VERSION 1.21.1) set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz) @@ -100,7 +100,7 @@ set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE set(FREETYPE_HASH 98bc3cf234fe88ef3cf24569251fe0a4) set(FREETYPE_HASH_TYPE MD5) set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz) -SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*") +set(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*") set(FREETYPE_HOMEPAGE https://freetype.org/) set(EPOXY_VERSION 1.5.10) @@ -460,7 +460,7 @@ set(BZIP2_HASH ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269) set(BZIP2_HASH_TYPE SHA256) set(BZIP2_FILE bzip2_${BZIP2_VERSION}.orig.tar.gz) set(BZIP2_CPE "cpe:2.3:a:bzip:bzip2:${BZIP2_VERSION}:*:*:*:*:*:*:*") -SET(BZIP2_HOMEPAGE https://sourceware.org/bzip2/) +set(BZIP2_HOMEPAGE https://sourceware.org/bzip2/) # NOTE: This will *HAVE* to match the version python ships on windows which # is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there @@ -471,7 +471,7 @@ set(FFI_HASH 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056) set(FFI_HASH_TYPE SHA256) set(FFI_FILE libffi-${FFI_VERSION}.tar.gz) set(FFI_CPE "cpe:2.3:a:libffi_project:libffi:${FFI_VERSION}:*:*:*:*:*:*:*") -SET(FFI_HOMEPAGE https://sourceware.org/libffi/) +set(FFI_HOMEPAGE https://sourceware.org/libffi/) set(LZMA_VERSION 5.2.5) set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2) @@ -778,7 +778,7 @@ set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.ta set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354) set(AOM_HASH_TYPE SHA256) set(AOM_FILE libaom-${AOM_VERSION}.tar.gz) -SET(AOM_HOMEPAGE https://aomedia.googlesource.com/aom/) +set(AOM_HOMEPAGE https://aomedia.googlesource.com/aom/) set(FRIBIDI_VERSION v1.0.12) set(FRIBIDI_URI https://github.com/fribidi/fribidi/archive/refs/tags/${FRIBIDI_VERSION}.tar.gz) diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index c53de479599..9dfea57ae5b 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -14,20 +14,20 @@ # # If `ALEMBIC_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED ALEMBIC_ROOT_DIR) +if(DEFINED ALEMBIC_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{ALEMBIC_ROOT_DIR}) - SET(ALEMBIC_ROOT_DIR $ENV{ALEMBIC_ROOT_DIR}) -ELSE() - SET(ALEMBIC_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{ALEMBIC_ROOT_DIR}) + set(ALEMBIC_ROOT_DIR $ENV{ALEMBIC_ROOT_DIR}) +else() + set(ALEMBIC_ROOT_DIR "") +endif() -SET(_alembic_SEARCH_DIRS +set(_alembic_SEARCH_DIRS ${ALEMBIC_ROOT_DIR} /opt/lib/alembic ) -FIND_PATH(ALEMBIC_INCLUDE_DIR +find_path(ALEMBIC_INCLUDE_DIR NAMES Alembic/Abc/All.h HINTS @@ -36,7 +36,7 @@ FIND_PATH(ALEMBIC_INCLUDE_DIR include ) -FIND_LIBRARY(ALEMBIC_LIBRARY +find_library(ALEMBIC_LIBRARY NAMES Alembic HINTS @@ -47,17 +47,17 @@ FIND_LIBRARY(ALEMBIC_LIBRARY # handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR) -IF(ALEMBIC_FOUND) - SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY}) - SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR}) -ENDIF() +if(ALEMBIC_FOUND) + set(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY}) + set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( ALEMBIC_INCLUDE_DIR ALEMBIC_LIBRARY ) -UNSET(_alembic_SEARCH_DIRS) +unset(_alembic_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake index 8da151af10c..ec105691bee 100644 --- a/build_files/cmake/Modules/FindAudaspace.cmake +++ b/build_files/cmake/Modules/FindAudaspace.cmake @@ -15,22 +15,22 @@ # AUDASPACE_PY_INCLUDE_DIRS - the audaspace's python binding include directories # AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding -IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "") - SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR}) -ENDIF() +if(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "") + set(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR}) +endif() -SET(_audaspace_SEARCH_DIRS +set(_audaspace_SEARCH_DIRS ${AUDASPACE_ROOT_DIR} ) # Use pkg-config to get hints about paths -FIND_PACKAGE(PkgConfig) -IF(PKG_CONFIG_FOUND) - PKG_CHECK_MODULES(AUDASPACE_PKGCONF audaspace) -ENDIF() +find_package(PkgConfig) +if(PKG_CONFIG_FOUND) + pkg_check_modules(AUDASPACE_PKGCONF audaspace) +endif() # Include dir -FIND_PATH(AUDASPACE_INCLUDE_DIR +find_path(AUDASPACE_INCLUDE_DIR NAMES ISound.h HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS} @@ -38,7 +38,7 @@ FIND_PATH(AUDASPACE_INCLUDE_DIR ) # Library -FIND_LIBRARY(AUDASPACE_LIBRARY +find_library(AUDASPACE_LIBRARY NAMES audaspace HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS} @@ -46,7 +46,7 @@ FIND_LIBRARY(AUDASPACE_LIBRARY ) # Include dir -FIND_PATH(AUDASPACE_C_INCLUDE_DIR +find_path(AUDASPACE_C_INCLUDE_DIR NAMES AUD_Sound.h HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS} @@ -54,7 +54,7 @@ FIND_PATH(AUDASPACE_C_INCLUDE_DIR ) # Library -FIND_LIBRARY(AUDASPACE_C_LIBRARY +find_library(AUDASPACE_C_LIBRARY NAMES audaspace-c HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS} @@ -62,7 +62,7 @@ FIND_LIBRARY(AUDASPACE_C_LIBRARY ) # Include dir -FIND_PATH(AUDASPACE_PY_INCLUDE_DIR +find_path(AUDASPACE_PY_INCLUDE_DIR NAMES python/PyAPI.h HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS} @@ -70,34 +70,34 @@ FIND_PATH(AUDASPACE_PY_INCLUDE_DIR ) # Library -FIND_LIBRARY(AUDASPACE_PY_LIBRARY +find_library(AUDASPACE_PY_LIBRARY NAMES audaspace-py HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS} PATH_SUFFIXES lib lib64 ) -FIND_PACKAGE(PackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace DEFAULT_MSG AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_C DEFAULT_MSG AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_Py DEFAULT_MSG AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR) +find_package(PackageHandleStandardArgs) +find_package_handle_standard_args(Audaspace DEFAULT_MSG AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR) +find_package_handle_standard_args(Audaspace_C DEFAULT_MSG AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR) +find_package_handle_standard_args(Audaspace_Py DEFAULT_MSG AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR) -IF(AUDASPACE_FOUND) - SET(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY}) - SET(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR}) -ENDIF() +if(AUDASPACE_FOUND) + set(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY}) + set(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR}) +endif() -IF(AUDASPACE_C_FOUND) - SET(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY}) - SET(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR}) -ENDIF() +if(AUDASPACE_C_FOUND) + set(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY}) + set(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR}) +endif() -IF(AUDASPACE_PY_FOUND) - SET(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY}) - SET(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR}) -ENDIF() +if(AUDASPACE_PY_FOUND) + set(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY}) + set(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( AUDASPACE_LIBRARY AUDASPACE_LIBRARIES AUDASPACE_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindBlosc.cmake b/build_files/cmake/Modules/FindBlosc.cmake index 4efe72a20d6..85dc1643e4c 100644 --- a/build_files/cmake/Modules/FindBlosc.cmake +++ b/build_files/cmake/Modules/FindBlosc.cmake @@ -16,20 +16,20 @@ # BLOSC_LIBRARY, where to find the Blosc library. # If `BLOSC_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED BLOSC_ROOT_DIR) +if(DEFINED BLOSC_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{BLOSC_ROOT_DIR}) - SET(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR}) -ELSE() - SET(BLOSC_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{BLOSC_ROOT_DIR}) + set(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR}) +else() + set(BLOSC_ROOT_DIR "") +endif() -SET(_blosc_SEARCH_DIRS +set(_blosc_SEARCH_DIRS ${BLOSC_ROOT_DIR} /opt/lib/blosc ) -FIND_PATH(BLOSC_INCLUDE_DIR +find_path(BLOSC_INCLUDE_DIR NAMES blosc.h HINTS @@ -38,7 +38,7 @@ FIND_PATH(BLOSC_INCLUDE_DIR include ) -FIND_LIBRARY(BLOSC_LIBRARY +find_library(BLOSC_LIBRARY NAMES blosc HINTS @@ -49,18 +49,18 @@ FIND_LIBRARY(BLOSC_LIBRARY # handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Blosc DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Blosc DEFAULT_MSG BLOSC_LIBRARY BLOSC_INCLUDE_DIR) -IF(BLOSC_FOUND) - SET(BLOSC_LIBRARIES ${BLOSC_LIBRARY}) - SET(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIR}) -ELSE() - SET(BLOSC_BLOSC_FOUND FALSE) -ENDIF() +if(BLOSC_FOUND) + set(BLOSC_LIBRARIES ${BLOSC_LIBRARY}) + set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIR}) +else() + set(BLOSC_BLOSC_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( BLOSC_INCLUDE_DIR BLOSC_LIBRARY ) diff --git a/build_files/cmake/Modules/FindBrotli.cmake b/build_files/cmake/Modules/FindBrotli.cmake index 8f35a6ca4c7..c3f90b36196 100644 --- a/build_files/cmake/Modules/FindBrotli.cmake +++ b/build_files/cmake/Modules/FindBrotli.cmake @@ -13,19 +13,19 @@ # # If `BROTLI_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED BROTLI_ROOT_DIR) +if(DEFINED BROTLI_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{BROTLI_ROOT_DIR}) - SET(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR}) -ELSE() - SET(BROTLI_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{BROTLI_ROOT_DIR}) + set(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR}) +else() + set(BROTLI_ROOT_DIR "") +endif() -SET(_BROTLI_SEARCH_DIRS +set(_BROTLI_SEARCH_DIRS ${BROTLI_ROOT_DIR} ) -FIND_PATH(BROTLI_INCLUDE_DIR +find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h HINTS @@ -35,7 +35,7 @@ FIND_PATH(BROTLI_INCLUDE_DIR DOC "Brotli header files" ) -FIND_LIBRARY(BROTLI_LIBRARY_COMMON +find_library(BROTLI_LIBRARY_COMMON NAMES # Some builds use a special `-static` postfix in their static libraries names. brotlicommon-static @@ -46,7 +46,7 @@ FIND_LIBRARY(BROTLI_LIBRARY_COMMON lib64 lib lib/static DOC "Brotli static common library" ) -FIND_LIBRARY(BROTLI_LIBRARY_DEC +find_library(BROTLI_LIBRARY_DEC NAMES # Some builds use a special `-static` postfix in their static libraries names. brotlidec-static @@ -59,26 +59,26 @@ FIND_LIBRARY(BROTLI_LIBRARY_DEC ) -IF((NOT BROTLI_LIBRARY_COMMON) OR (NOT BROTLI_LIBRARY_DEC)) +if((NOT BROTLI_LIBRARY_COMMON) OR (NOT BROTLI_LIBRARY_DEC)) set(BROTLI_FOUND FALSE) -ELSE() +else() # handle the QUIETLY and REQUIRED arguments and set BROTLI_FOUND to TRUE if # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Brotli DEFAULT_MSG BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_INCLUDE_DIR) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Brotli DEFAULT_MSG BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_INCLUDE_DIR) - IF(BROTLI_FOUND) + if(BROTLI_FOUND) get_filename_component(BROTLI_LIBRARY_DIR ${BROTLI_LIBRARY_COMMON} DIRECTORY) - SET(BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR}) - SET(BROTLI_LIBRARIES ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON}) - ENDIF() -ENDIF() + set(BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR}) + set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON}) + endif() +endif() -MARK_AS_ADVANCED( +mark_as_advanced( BROTLI_INCLUDE_DIR BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_LIBRARY_DIR ) -UNSET(_BROTLI_SEARCH_DIRS) +unset(_BROTLI_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake index b2a9b392b5f..977c565d917 100644 --- a/build_files/cmake/Modules/FindEigen3.cmake +++ b/build_files/cmake/Modules/FindEigen3.cmake @@ -12,19 +12,19 @@ # EIGEN3_FOUND, If false, do not try to use Eigen3. # If `EIGEN3_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED EIGEN3_ROOT_DIR) +if(DEFINED EIGEN3_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{EIGEN3_ROOT_DIR}) - SET(EIGEN3_ROOT_DIR $ENV{EIGEN3_ROOT_DIR}) -ELSE() - SET(EIGEN3_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{EIGEN3_ROOT_DIR}) + set(EIGEN3_ROOT_DIR $ENV{EIGEN3_ROOT_DIR}) +else() + set(EIGEN3_ROOT_DIR "") +endif() -SET(_eigen3_SEARCH_DIRS +set(_eigen3_SEARCH_DIRS ${EIGEN3_ROOT_DIR} ) -FIND_PATH(EIGEN3_INCLUDE_DIR +find_path(EIGEN3_INCLUDE_DIR NAMES # header has no '.h' suffix Eigen/Eigen @@ -36,14 +36,14 @@ FIND_PATH(EIGEN3_INCLUDE_DIR # handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR) -IF(EIGEN3_FOUND) - SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) -ENDIF() +if(EIGEN3_FOUND) + set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( EIGEN3_INCLUDE_DIR ) diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index b40e15a2399..8d64e09e0f9 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -13,20 +13,20 @@ # EMBREEFOUND, If false, do not try to use Embree. # If `EMBREE_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED EMBREE_ROOT_DIR) +if(DEFINED EMBREE_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{EMBREE_ROOT_DIR}) - SET(EMBREE_ROOT_DIR $ENV{EMBREE_ROOT_DIR}) -ELSE() - SET(EMBREE_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{EMBREE_ROOT_DIR}) + set(EMBREE_ROOT_DIR $ENV{EMBREE_ROOT_DIR}) +else() + set(EMBREE_ROOT_DIR "") +endif() -SET(_embree_SEARCH_DIRS +set(_embree_SEARCH_DIRS ${EMBREE_ROOT_DIR} /opt/lib/embree ) -FIND_PATH(EMBREE_INCLUDE_DIR +find_path(EMBREE_INCLUDE_DIR NAMES embree4/rtcore.h embree3/rtcore.h @@ -36,44 +36,44 @@ FIND_PATH(EMBREE_INCLUDE_DIR include ) -IF(EXISTS ${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h) - SET(EMBREE_MAJOR_VERSION 4) -ELSE() - SET(EMBREE_MAJOR_VERSION 3) -ENDIF() +if(EXISTS ${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h) + set(EMBREE_MAJOR_VERSION 4) +else() + set(EMBREE_MAJOR_VERSION 3) +endif() -IF(EMBREE_INCLUDE_DIR) - FILE(READ ${EMBREE_INCLUDE_DIR}/embree${EMBREE_MAJOR_VERSION}/rtcore_config.h _embree_config_header) - IF(_embree_config_header MATCHES "#define EMBREE_STATIC_LIB") - SET(EMBREE_STATIC_LIB TRUE) - ELSE() - SET(EMBREE_STATIC_LIB FALSE) - ENDIF() - IF(_embree_config_header MATCHES "#define EMBREE_SYCL_SUPPORT") - SET(EMBREE_SYCL_SUPPORT TRUE) - ELSE() - SET(EMBREE_SYCL_SUPPORT FALSE) - ENDIF() - UNSET(_embree_config_header) -ENDIF() +if(EMBREE_INCLUDE_DIR) + file(READ ${EMBREE_INCLUDE_DIR}/embree${EMBREE_MAJOR_VERSION}/rtcore_config.h _embree_config_header) + if(_embree_config_header MATCHES "#define EMBREE_STATIC_LIB") + set(EMBREE_STATIC_LIB TRUE) + else() + set(EMBREE_STATIC_LIB FALSE) + endif() + if(_embree_config_header MATCHES "#define EMBREE_SYCL_SUPPORT") + set(EMBREE_SYCL_SUPPORT TRUE) + else() + set(EMBREE_SYCL_SUPPORT FALSE) + endif() + unset(_embree_config_header) +endif() -IF(EMBREE_STATIC_LIB) - IF(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")))) - SET(_embree_SIMD_COMPONENTS +if(EMBREE_STATIC_LIB) + if(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")))) + set(_embree_SIMD_COMPONENTS embree_sse42 embree_avx embree_avx2 ) - ENDIF() + endif() - IF(EMBREE_SYCL_SUPPORT) - SET(_embree_GPU_COMPONENTS + if(EMBREE_SYCL_SUPPORT) + set(_embree_GPU_COMPONENTS embree4_sycl embree_rthwif ) - ENDIF() + endif() - SET(_embree_FIND_COMPONENTS + set(_embree_FIND_COMPONENTS embree${EMBREE_MAJOR_VERSION} ${_embree_SIMD_COMPONENTS} ${_embree_GPU_COMPONENTS} @@ -83,21 +83,21 @@ IF(EMBREE_STATIC_LIB) sys tasking ) -ELSE() - SET(_embree_FIND_COMPONENTS +else() + set(_embree_FIND_COMPONENTS embree${EMBREE_MAJOR_VERSION} ) - IF(EMBREE_SYCL_SUPPORT) - LIST(APPEND _embree_FIND_COMPONENTS + if(EMBREE_SYCL_SUPPORT) + list(APPEND _embree_FIND_COMPONENTS embree4_sycl ) - ENDIF() -ENDIF() + endif() +endif() -SET(_embree_LIBRARIES) -FOREACH(COMPONENT ${_embree_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(EMBREE_${UPPERCOMPONENT}_LIBRARY +set(_embree_LIBRARIES) +foreach(COMPONENT ${_embree_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + find_library(EMBREE_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -105,32 +105,32 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() + list(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}") +endforeach() # handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Embree DEFAULT_MSG _embree_LIBRARIES EMBREE_INCLUDE_DIR) -IF(EMBREE_FOUND) - SET(EMBREE_LIBRARIES ${_embree_LIBRARIES}) - SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR}) -ENDIF() +if(EMBREE_FOUND) + set(EMBREE_LIBRARIES ${_embree_LIBRARIES}) + set(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( EMBREE_INCLUDE_DIR EMBREE_MAJOR_VERSION EMBREE_SYCL_SUPPORT EMBREE_STATIC_LIB ) -FOREACH(COMPONENT ${_embree_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - MARK_AS_ADVANCED(EMBREE_${UPPERCOMPONENT}_LIBRARY) -ENDFOREACH() +foreach(COMPONENT ${_embree_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + mark_as_advanced(EMBREE_${UPPERCOMPONENT}_LIBRARY) +endforeach() -UNSET(_embree_SEARCH_DIRS) -UNSET(_embree_FIND_COMPONENTS) -UNSET(_embree_LIBRARIES) +unset(_embree_SEARCH_DIRS) +unset(_embree_FIND_COMPONENTS) +unset(_embree_LIBRARIES) diff --git a/build_files/cmake/Modules/FindEpoxy.cmake b/build_files/cmake/Modules/FindEpoxy.cmake index 8acfa025be7..13f3312635c 100644 --- a/build_files/cmake/Modules/FindEpoxy.cmake +++ b/build_files/cmake/Modules/FindEpoxy.cmake @@ -10,15 +10,15 @@ # Epoxy_FOUND, If false, do not try to use epoxy. # If `EPOXY_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED EPOXY_ROOT_DIR) +if(DEFINED EPOXY_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{EPOXY_ROOT_DIR}) - SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR}) -ELSE() - SET(EPOXY_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{EPOXY_ROOT_DIR}) + set(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR}) +else() + set(EPOXY_ROOT_DIR "") +endif() -FIND_PATH(Epoxy_INCLUDE_DIR +find_path(Epoxy_INCLUDE_DIR NAMES epoxy/gl.h HINTS @@ -27,7 +27,7 @@ FIND_PATH(Epoxy_INCLUDE_DIR include ) -FIND_LIBRARY(Epoxy_LIBRARY +find_library(Epoxy_LIBRARY NAMES epoxy HINTS @@ -38,16 +38,16 @@ FIND_LIBRARY(Epoxy_LIBRARY # handle the QUIETLY and REQUIRED arguments and set Epoxy_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Epoxy DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Epoxy DEFAULT_MSG Epoxy_LIBRARY Epoxy_INCLUDE_DIR) -IF(Epoxy_FOUND) - SET(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR}) - SET(Epoxy_LIBRARIES ${Epoxy_LIBRARY}) -ENDIF() +if(Epoxy_FOUND) + set(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR}) + set(Epoxy_LIBRARIES ${Epoxy_LIBRARY}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( Epoxy_INCLUDE_DIR Epoxy_LIBRARY ) diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake index d73bb7265b7..d8375f49066 100644 --- a/build_files/cmake/Modules/FindFFmpeg.cmake +++ b/build_files/cmake/Modules/FindFFmpeg.cmake @@ -73,10 +73,10 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FFmpeg DEFAULT_MSG _ffmpeg_LIBRARIES _ffmpeg_INCLUDE_DIR) -IF(FFMPEG_FOUND) +if(FFMPEG_FOUND) set(FFMPEG_LIBRARIES ${_ffmpeg_LIBRARIES}) set(FFMPEG_INCLUDE_DIRS ${_ffmpeg_INCLUDE_DIR}) -ENDIF() +endif() mark_as_advanced( FFMPEG_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index bef09cf80b8..2f282a68884 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -16,19 +16,19 @@ # FFTW3_LIBRARY, where to find the Fftw3 library. # If `FFTW3_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED FFTW3_ROOT_DIR) +if(DEFINED FFTW3_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{FFTW3_ROOT_DIR}) - SET(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR}) -ELSE() - SET(FFTW3_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{FFTW3_ROOT_DIR}) + set(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR}) +else() + set(FFTW3_ROOT_DIR "") +endif() -SET(_fftw3_SEARCH_DIRS +set(_fftw3_SEARCH_DIRS ${FFTW3_ROOT_DIR} ) -FIND_PATH(FFTW3_INCLUDE_DIR +find_path(FFTW3_INCLUDE_DIR NAMES fftw3.h HINTS @@ -37,7 +37,7 @@ FIND_PATH(FFTW3_INCLUDE_DIR include ) -FIND_LIBRARY(FFTW3_LIBRARY +find_library(FFTW3_LIBRARY NAMES fftw3 HINTS @@ -48,16 +48,16 @@ FIND_LIBRARY(FFTW3_LIBRARY # handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Fftw3 DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE_DIR) -IF(FFTW3_FOUND) - SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY}) - SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR}) -ENDIF() +if(FFTW3_FOUND) + set(FFTW3_LIBRARIES ${FFTW3_LIBRARY}) + set(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( FFTW3_INCLUDE_DIR FFTW3_LIBRARY ) diff --git a/build_files/cmake/Modules/FindGMP.cmake b/build_files/cmake/Modules/FindGMP.cmake index 4363cdca416..9de1970d118 100644 --- a/build_files/cmake/Modules/FindGMP.cmake +++ b/build_files/cmake/Modules/FindGMP.cmake @@ -16,20 +16,20 @@ # GMP_LIBRARY, where to find the GMP library. # If `GMP_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED GMP_ROOT_DIR) +if(DEFINED GMP_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{GMP_ROOT_DIR}) - SET(GMP_ROOT_DIR $ENV{GMP_ROOT_DIR}) -ELSE() - SET(GMP_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{GMP_ROOT_DIR}) + set(GMP_ROOT_DIR $ENV{GMP_ROOT_DIR}) +else() + set(GMP_ROOT_DIR "") +endif() -SET(_gmp_SEARCH_DIRS +set(_gmp_SEARCH_DIRS ${GMP_ROOT_DIR} /opt/lib/gmp ) -FIND_PATH(GMP_INCLUDE_DIR +find_path(GMP_INCLUDE_DIR NAMES gmp.h HINTS @@ -38,7 +38,7 @@ FIND_PATH(GMP_INCLUDE_DIR include/gmp ) -FIND_PATH(GMPXX_INCLUDE_DIR +find_path(GMPXX_INCLUDE_DIR NAMES gmpxx.h HINTS @@ -47,7 +47,7 @@ FIND_PATH(GMPXX_INCLUDE_DIR include/gmp ) -FIND_LIBRARY(GMP_LIBRARY +find_library(GMP_LIBRARY NAMES gmp HINTS @@ -56,7 +56,7 @@ FIND_LIBRARY(GMP_LIBRARY lib64 lib ) -FIND_LIBRARY(GMPXX_LIBRARY +find_library(GMPXX_LIBRARY NAMES gmpxx HINTS @@ -66,7 +66,7 @@ FIND_LIBRARY(GMPXX_LIBRARY ) if(GMP_INCLUDE_DIR) - SET(_version_regex "^#define[ \t]+__GNU_MP_VERSION[ \t]+\"([^\"]+)\".*") + set(_version_regex "^#define[ \t]+__GNU_MP_VERSION[ \t]+\"([^\"]+)\".*") file(STRINGS "${GMP_INCLUDE_DIR}/gmp.h" GMP_VERSION REGEX "${_version_regex}") string(REGEX REPLACE "${_version_regex}" "\\1" @@ -76,16 +76,16 @@ endif() # handle the QUIETLY and REQUIRED arguments and set GMP_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GMP DEFAULT_MSG GMP_LIBRARY GMPXX_LIBRARY GMP_INCLUDE_DIR GMPXX_INCLUDE_DIR) -IF(GMP_FOUND) - SET(GMP_LIBRARIES ${GMPXX_LIBRARY} ${GMP_LIBRARY}) - SET(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR} ${GMPXX_INCLUDE_DIR}) -ENDIF() +if(GMP_FOUND) + set(GMP_LIBRARIES ${GMPXX_LIBRARY} ${GMP_LIBRARY}) + set(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR} ${GMPXX_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( GMP_INCLUDE_DIR GMP_LIBRARY GMPXX_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index e1fdf37ee6c..0db59bad268 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -14,25 +14,25 @@ # ICU_LIBRARY_xxx, where to find the icu libraries. # If `ICU_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED ICU_ROOT_DIR) +if(DEFINED ICU_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{ICU_ROOT_DIR}) - SET(ICU_ROOT_DIR $ENV{ICU_ROOT_DIR}) -ELSE() - SET(ICU_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{ICU_ROOT_DIR}) + set(ICU_ROOT_DIR $ENV{ICU_ROOT_DIR}) +else() + set(ICU_ROOT_DIR "") +endif() if(Boost_USE_STATIC_LIBS) set(_icu_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES .a) endif() -SET(_icu_SEARCH_DIRS +set(_icu_SEARCH_DIRS ${ICU_ROOT_DIR} ) # We don't need includes, only libs to link against... -# FIND_PATH(ICU_INCLUDE_DIR +# find_path(ICU_INCLUDE_DIR # NAMES # utf.h # HINTS @@ -41,7 +41,7 @@ SET(_icu_SEARCH_DIRS # include/unicode # ) -FIND_LIBRARY(ICU_LIBRARY_DATA +find_library(ICU_LIBRARY_DATA NAMES icudata HINTS @@ -50,7 +50,7 @@ FIND_LIBRARY(ICU_LIBRARY_DATA lib64 lib ) -FIND_LIBRARY(ICU_LIBRARY_I18N +find_library(ICU_LIBRARY_I18N NAMES icui18n HINTS @@ -59,7 +59,7 @@ FIND_LIBRARY(ICU_LIBRARY_I18N lib64 lib ) -FIND_LIBRARY(ICU_LIBRARY_IO +find_library(ICU_LIBRARY_IO NAMES icuio HINTS @@ -68,7 +68,7 @@ FIND_LIBRARY(ICU_LIBRARY_IO lib64 lib ) -FIND_LIBRARY(ICU_LIBRARY_LE +find_library(ICU_LIBRARY_LE NAMES icule HINTS @@ -77,7 +77,7 @@ FIND_LIBRARY(ICU_LIBRARY_LE lib64 lib ) -FIND_LIBRARY(ICU_LIBRARY_LX +find_library(ICU_LIBRARY_LX NAMES iculx HINTS @@ -86,7 +86,7 @@ FIND_LIBRARY(ICU_LIBRARY_LX lib64 lib ) -FIND_LIBRARY(ICU_LIBRARY_TU +find_library(ICU_LIBRARY_TU NAMES icutu HINTS @@ -95,7 +95,7 @@ FIND_LIBRARY(ICU_LIBRARY_TU lib64 lib ) -FIND_LIBRARY(ICU_LIBRARY_UC +find_library(ICU_LIBRARY_UC NAMES icuuc HINTS @@ -111,8 +111,8 @@ endif() # handle the QUIETLY and REQUIRED arguments and set ICU_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Icu DEFAULT_MSG ICU_LIBRARY_DATA ICU_LIBRARY_I18N ICU_LIBRARY_IO @@ -122,12 +122,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG ICU_LIBRARY_UC ) -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() +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() -MARK_AS_ADVANCED( +mark_as_advanced( ICU_INCLUDE_DIR ICU_LIBRARY_DATA ICU_LIBRARY_I18N diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index a12e3b4400b..2b45fc8de30 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -16,19 +16,19 @@ # JACK_LIBRARY, where to find the JACK library. # If `JACK_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED JACK_ROOT_DIR) +if(DEFINED JACK_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{JACK_ROOT_DIR}) - SET(JACK_ROOT_DIR $ENV{JACK_ROOT_DIR}) -ELSE() - SET(JACK_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{JACK_ROOT_DIR}) + set(JACK_ROOT_DIR $ENV{JACK_ROOT_DIR}) +else() + set(JACK_ROOT_DIR "") +endif() -SET(_jack_SEARCH_DIRS +set(_jack_SEARCH_DIRS ${JACK_ROOT_DIR} ) -FIND_PATH(JACK_INCLUDE_DIR +find_path(JACK_INCLUDE_DIR NAMES jack.h HINTS @@ -37,7 +37,7 @@ FIND_PATH(JACK_INCLUDE_DIR include/jack ) -FIND_LIBRARY(JACK_LIBRARY +find_library(JACK_LIBRARY NAMES jack HINTS @@ -48,16 +48,16 @@ FIND_LIBRARY(JACK_LIBRARY # handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Jack DEFAULT_MSG JACK_LIBRARY JACK_INCLUDE_DIR) -IF(JACK_FOUND) - SET(JACK_LIBRARIES ${JACK_LIBRARY}) - SET(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR}) -ENDIF() +if(JACK_FOUND) + set(JACK_LIBRARIES ${JACK_LIBRARY}) + set(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( JACK_INCLUDE_DIR JACK_LIBRARY ) diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index c6a77e83471..1c0409844e2 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -16,20 +16,20 @@ # JEMALLOC_LIBRARY, where to find the JeMalloc library. # If `JEMALLOC_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED JEMALLOC_ROOT_DIR) +if(DEFINED JEMALLOC_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{JEMALLOC_ROOT_DIR}) - SET(JEMALLOC_ROOT_DIR $ENV{JEMALLOC_ROOT_DIR}) -ELSE() - SET(JEMALLOC_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{JEMALLOC_ROOT_DIR}) + set(JEMALLOC_ROOT_DIR $ENV{JEMALLOC_ROOT_DIR}) +else() + set(JEMALLOC_ROOT_DIR "") +endif() -SET(_jemalloc_SEARCH_DIRS +set(_jemalloc_SEARCH_DIRS ${JEMALLOC_ROOT_DIR} /opt/lib/jemalloc ) -FIND_PATH(JEMALLOC_INCLUDE_DIR +find_path(JEMALLOC_INCLUDE_DIR NAMES jemalloc.h HINTS @@ -38,7 +38,7 @@ FIND_PATH(JEMALLOC_INCLUDE_DIR include/jemalloc ) -FIND_LIBRARY(JEMALLOC_LIBRARY +find_library(JEMALLOC_LIBRARY NAMES jemalloc HINTS @@ -48,7 +48,7 @@ FIND_LIBRARY(JEMALLOC_LIBRARY ) if(JEMALLOC_INCLUDE_DIR) - SET(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*") + set(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*") file(STRINGS "${JEMALLOC_INCLUDE_DIR}/jemalloc.h" JEMALLOC_VERSION REGEX "${_version_regex}") string(REGEX REPLACE "${_version_regex}" "\\1" @@ -58,16 +58,16 @@ endif() # handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(JeMalloc DEFAULT_MSG JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR) -IF(JEMALLOC_FOUND) - SET(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY}) - SET(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR}) -ENDIF() +if(JEMALLOC_FOUND) + set(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY}) + set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY ) diff --git a/build_files/cmake/Modules/FindLLVM.cmake b/build_files/cmake/Modules/FindLLVM.cmake index 586ae281e65..4c7cc5f1c1f 100644 --- a/build_files/cmake/Modules/FindLLVM.cmake +++ b/build_files/cmake/Modules/FindLLVM.cmake @@ -83,10 +83,10 @@ endif() # 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 +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARY) -MARK_AS_ADVANCED( +mark_as_advanced( LLVM_LIBRARY ) diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index fed8b3d488a..edbc1a49676 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -16,26 +16,26 @@ # LZO_LIBRARY, where to find the LZO library. # If `LZO_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED LZO_ROOT_DIR) +if(DEFINED LZO_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{LZO_ROOT_DIR}) - SET(LZO_ROOT_DIR $ENV{LZO_ROOT_DIR}) -ELSE() - SET(LZO_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{LZO_ROOT_DIR}) + set(LZO_ROOT_DIR $ENV{LZO_ROOT_DIR}) +else() + set(LZO_ROOT_DIR "") +endif() -SET(_lzo_SEARCH_DIRS +set(_lzo_SEARCH_DIRS ${LZO_ROOT_DIR} ) -FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h +find_path(LZO_INCLUDE_DIR lzo/lzo1x.h HINTS ${_lzo_SEARCH_DIRS} PATH_SUFFIXES include ) -FIND_LIBRARY(LZO_LIBRARY +find_library(LZO_LIBRARY NAMES lzo2 HINTS @@ -46,16 +46,16 @@ FIND_LIBRARY(LZO_LIBRARY # handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LZO DEFAULT_MSG LZO_LIBRARY LZO_INCLUDE_DIR) -IF(LZO_FOUND) - SET(LZO_LIBRARIES ${LZO_LIBRARY}) - SET(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR}) -ENDIF() +if(LZO_FOUND) + set(LZO_LIBRARIES ${LZO_LIBRARY}) + set(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( LZO_INCLUDE_DIR LZO_LIBRARY ) diff --git a/build_files/cmake/Modules/FindLevelZero.cmake b/build_files/cmake/Modules/FindLevelZero.cmake index 45326890589..56687cced32 100644 --- a/build_files/cmake/Modules/FindLevelZero.cmake +++ b/build_files/cmake/Modules/FindLevelZero.cmake @@ -12,21 +12,21 @@ # LEVEL_ZERO_FOUND, If false, then don't try to use L0. # If `LEVEL_ZERO_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED LEVEL_ZERO_ROOT_DIR) +if(DEFINED LEVEL_ZERO_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{LEVEL_ZERO_ROOT_DIR}) - SET(LEVEL_ZERO_ROOT_DIR $ENV{LEVEL_ZERO_ROOT_DIR}) -ELSE() - SET(LEVEL_ZERO_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{LEVEL_ZERO_ROOT_DIR}) + set(LEVEL_ZERO_ROOT_DIR $ENV{LEVEL_ZERO_ROOT_DIR}) +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 ) -FIND_LIBRARY(_LEVEL_ZERO_LIBRARY +find_library(_LEVEL_ZERO_LIBRARY NAMES ze_loader HINTS @@ -35,7 +35,7 @@ FIND_LIBRARY(_LEVEL_ZERO_LIBRARY lib64 lib ) -FIND_PATH(_LEVEL_ZERO_INCLUDE_DIR +find_path(_LEVEL_ZERO_INCLUDE_DIR NAMES level_zero/ze_api.h HINTS @@ -44,19 +44,19 @@ FIND_PATH(_LEVEL_ZERO_INCLUDE_DIR include ) -INCLUDE(FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LevelZero DEFAULT_MSG _LEVEL_ZERO_LIBRARY _LEVEL_ZERO_INCLUDE_DIR) +find_package_handle_standard_args(LevelZero DEFAULT_MSG _LEVEL_ZERO_LIBRARY _LEVEL_ZERO_INCLUDE_DIR) -IF(LevelZero_FOUND) - SET(LEVEL_ZERO_LIBRARY ${_LEVEL_ZERO_LIBRARY}) - SET(LEVEL_ZERO_INCLUDE_DIR ${_LEVEL_ZERO_INCLUDE_DIR}) - SET(LEVEL_ZERO_FOUND TRUE) -ELSE() - SET(LEVEL_ZERO_FOUND FALSE) -ENDIF() +if(LevelZero_FOUND) + set(LEVEL_ZERO_LIBRARY ${_LEVEL_ZERO_LIBRARY}) + set(LEVEL_ZERO_INCLUDE_DIR ${_LEVEL_ZERO_INCLUDE_DIR}) + set(LEVEL_ZERO_FOUND TRUE) +else() + set(LEVEL_ZERO_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( LEVEL_ZERO_LIBRARY LEVEL_ZERO_INCLUDE_DIR ) diff --git a/build_files/cmake/Modules/FindLibEpoxy.cmake b/build_files/cmake/Modules/FindLibEpoxy.cmake index f5cb9584ae1..9f752f7d8cf 100644 --- a/build_files/cmake/Modules/FindLibEpoxy.cmake +++ b/build_files/cmake/Modules/FindLibEpoxy.cmake @@ -9,11 +9,11 @@ # This can also be an environment variable. # LibEpoxy_FOUND, If false, do not try to use libepoxy. -IF(NOT EPOXY_ROOT_DIR AND NOT $ENV{EPOXY_ROOT_DIR} STREQUAL "") - SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR}) -ENDIF() +if(NOT EPOXY_ROOT_DIR AND NOT $ENV{EPOXY_ROOT_DIR} STREQUAL "") + set(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR}) +endif() -FIND_PATH(LibEpoxy_INCLUDE_DIR +find_path(LibEpoxy_INCLUDE_DIR NAMES epoxy/gl.h HINTS @@ -22,7 +22,7 @@ FIND_PATH(LibEpoxy_INCLUDE_DIR include ) -FIND_LIBRARY(LibEpoxy_LIBRARY +find_library(LibEpoxy_LIBRARY NAMES epoxy HINTS @@ -33,16 +33,16 @@ FIND_LIBRARY(LibEpoxy_LIBRARY # handle the QUIETLY and REQUIRED arguments and set LibEpoxy_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEpoxy DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LibEpoxy DEFAULT_MSG LibEpoxy_LIBRARY LibEpoxy_INCLUDE_DIR) -IF(LibEpoxy_FOUND) - SET(LibEpoxy_INCLUDE_DIRS ${LibEpoxy_INCLUDE_DIR}) - SET(LibEpoxy_LIBRARIES ${LibEpoxy_LIBRARY}) -ENDIF() +if(LibEpoxy_FOUND) + set(LibEpoxy_INCLUDE_DIRS ${LibEpoxy_INCLUDE_DIR}) + set(LibEpoxy_LIBRARIES ${LibEpoxy_LIBRARY}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( LibEpoxy_INCLUDE_DIR LibEpoxy_LIBRARY ) diff --git a/build_files/cmake/Modules/FindMoltenVK.cmake b/build_files/cmake/Modules/FindMoltenVK.cmake index 4400cf1c8c2..5d91b56140e 100644 --- a/build_files/cmake/Modules/FindMoltenVK.cmake +++ b/build_files/cmake/Modules/FindMoltenVK.cmake @@ -14,25 +14,25 @@ # # If `MOLTENVK_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED MOLTENVK_ROOT_DIR) +if(DEFINED MOLTENVK_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{MOLTENVK_ROOT_DIR}) - SET(MOLTENVK_ROOT_DIR $ENV{MOLTENVK_ROOT_DIR}) -ELSE() - SET(MOLTENVK_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{MOLTENVK_ROOT_DIR}) + set(MOLTENVK_ROOT_DIR $ENV{MOLTENVK_ROOT_DIR}) +else() + set(MOLTENVK_ROOT_DIR "") +endif() -SET(_moltenvk_SEARCH_DIRS +set(_moltenvk_SEARCH_DIRS ${MOLTENVK_ROOT_DIR} ) # FIXME: These finder modules typically don't use LIBDIR, # this should be set by `./build_files/cmake/platform/` instead. -IF(DEFINED LIBDIR) - SET(_moltenvk_SEARCH_DIRS ${_moltenvk_SEARCH_DIRS} ${LIBDIR}/moltenvk) -ENDIF() +if(DEFINED LIBDIR) + set(_moltenvk_SEARCH_DIRS ${_moltenvk_SEARCH_DIRS} ${LIBDIR}/moltenvk) +endif() -FIND_PATH(MOLTENVK_INCLUDE_DIR +find_path(MOLTENVK_INCLUDE_DIR NAMES MoltenVK/vk_mvk_moltenvk.h HINTS @@ -41,7 +41,7 @@ FIND_PATH(MOLTENVK_INCLUDE_DIR include ) -FIND_LIBRARY(MOLTENVK_LIBRARY +find_library(MOLTENVK_LIBRARY NAMES MoltenVK HINTS @@ -52,17 +52,17 @@ FIND_LIBRARY(MOLTENVK_LIBRARY # handle the QUIETLY and REQUIRED arguments and set MOLTENVK_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MoltenVK DEFAULT_MSG MOLTENVK_LIBRARY MOLTENVK_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(MoltenVK DEFAULT_MSG MOLTENVK_LIBRARY MOLTENVK_INCLUDE_DIR) -IF(MOLTENVK_FOUND) - SET(MOLTENVK_LIBRARIES ${MOLTENVK_LIBRARY}) - SET(MOLTENVK_INCLUDE_DIRS ${MOLTENVK_INCLUDE_DIR}) -ENDIF() +if(MOLTENVK_FOUND) + set(MOLTENVK_LIBRARIES ${MOLTENVK_LIBRARY}) + set(MOLTENVK_INCLUDE_DIRS ${MOLTENVK_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( MOLTENVK_INCLUDE_DIR MOLTENVK_LIBRARY ) -UNSET(_moltenvk_SEARCH_DIRS) +unset(_moltenvk_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindNanoVDB.cmake b/build_files/cmake/Modules/FindNanoVDB.cmake index 49a207e6eaf..5ad876e36e1 100644 --- a/build_files/cmake/Modules/FindNanoVDB.cmake +++ b/build_files/cmake/Modules/FindNanoVDB.cmake @@ -12,19 +12,19 @@ # NANOVDB_FOUND, If false, do not try to use NanoVDB. # If `NANOVDB_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED NANOVDB_ROOT_DIR) +if(DEFINED NANOVDB_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{NANOVDB_ROOT_DIR}) - SET(NANOVDB_ROOT_DIR $ENV{NANOVDB_ROOT_DIR}) -ELSE() - SET(NANOVDB_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{NANOVDB_ROOT_DIR}) + set(NANOVDB_ROOT_DIR $ENV{NANOVDB_ROOT_DIR}) +else() + set(NANOVDB_ROOT_DIR "") +endif() -SET(_nanovdb_SEARCH_DIRS +set(_nanovdb_SEARCH_DIRS ${NANOVDB_ROOT_DIR} ) -FIND_PATH(NANOVDB_INCLUDE_DIR +find_path(NANOVDB_INCLUDE_DIR NAMES nanovdb/NanoVDB.h HINTS @@ -35,16 +35,16 @@ FIND_PATH(NANOVDB_INCLUDE_DIR # 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 +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(NanoVDB DEFAULT_MSG NANOVDB_INCLUDE_DIR) -IF(NANOVDB_FOUND) - SET(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR}) -ENDIF() +if(NANOVDB_FOUND) + set(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( NANOVDB_INCLUDE_DIR ) -UNSET(_nanovdb_SEARCH_DIRS) +unset(_nanovdb_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOSL.cmake b/build_files/cmake/Modules/FindOSL.cmake index 95cb0f73762..bd81e54cfbf 100644 --- a/build_files/cmake/Modules/FindOSL.cmake +++ b/build_files/cmake/Modules/FindOSL.cmake @@ -16,34 +16,34 @@ # and minor versions of OSL library if found. # If `OSL_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OSL_ROOT_DIR) +if(DEFINED OSL_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OSL_ROOT_DIR}) - SET(OSL_ROOT_DIR $ENV{OSL_ROOT_DIR}) -ELSE() - SET(OSL_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OSL_ROOT_DIR}) + set(OSL_ROOT_DIR $ENV{OSL_ROOT_DIR}) +else() + set(OSL_ROOT_DIR "") +endif() # If `OSLHOME` was defined in the environment, use it. -IF(DEFINED ENV{OSLHOME}) - SET(OSL_HOME_DIR $ENV{OSLHOME}) -ELSE() - SET(OSL_HOME_DIR "") -ENDIF() +if(DEFINED ENV{OSLHOME}) + set(OSL_HOME_DIR $ENV{OSLHOME}) +else() + set(OSL_HOME_DIR "") +endif() -SET(_osl_FIND_COMPONENTS +set(_osl_FIND_COMPONENTS oslnoise oslcomp oslexec oslquery ) -SET(_osl_SEARCH_DIRS +set(_osl_SEARCH_DIRS ${OSL_ROOT_DIR} /opt/lib/osl ) -FIND_PATH(OSL_INCLUDE_DIR +find_path(OSL_INCLUDE_DIR NAMES OSL/oslversion.h HINTS @@ -52,10 +52,10 @@ FIND_PATH(OSL_INCLUDE_DIR include ) -FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +foreach(COMPONENT ${_osl_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OSL_${UPPERCOMPONENT}_LIBRARY + find_library(OSL_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -63,28 +63,28 @@ FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) -ENDFOREACH() +endforeach() # Note linking order matters, and oslnoise existence depends on version. -SET(_osl_LIBRARIES ${OSL_OSLCOMP_LIBRARY}) -IF(APPLE) +set(_osl_LIBRARIES ${OSL_OSLCOMP_LIBRARY}) +if(APPLE) list(APPEND _osl_LIBRARIES -force_load ${OSL_OSLEXEC_LIBRARY}) -ELSE() +else() list(APPEND _osl_LIBRARIES ${OSL_OSLEXEC_LIBRARY}) -ENDIF() +endif() list(APPEND _osl_LIBRARIES ${OSL_OSLQUERY_LIBRARY}) -IF(OSL_OSLNOISE_LIBRARY) +if(OSL_OSLNOISE_LIBRARY) list(APPEND _osl_LIBRARIES ${OSL_OSLNOISE_LIBRARY}) -ENDIF() +endif() -FIND_PROGRAM(OSL_COMPILER oslc +find_program(OSL_COMPILER oslc HINTS ${_osl_SEARCH_DIRS} PATH_SUFFIXES bin) get_filename_component(OSL_SHADER_HINT ${OSL_COMPILER} DIRECTORY) get_filename_component(OSL_SHADER_HINT ${OSL_SHADER_DIR}/../ ABSOLUTE) -FIND_PATH(OSL_SHADER_DIR +find_path(OSL_SHADER_DIR NAMES stdosl.h HINTS @@ -100,32 +100,32 @@ FIND_PATH(OSL_SHADER_DIR # handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSL DEFAULT_MSG _osl_LIBRARIES OSL_INCLUDE_DIR OSL_COMPILER) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OSL DEFAULT_MSG _osl_LIBRARIES OSL_INCLUDE_DIR OSL_COMPILER) -IF(OSL_FOUND) - SET(OSL_LIBRARIES ${_osl_LIBRARIES}) - SET(OSL_INCLUDE_DIRS ${OSL_INCLUDE_DIR}) +if(OSL_FOUND) + set(OSL_LIBRARIES ${_osl_LIBRARIES}) + set(OSL_INCLUDE_DIRS ${OSL_INCLUDE_DIR}) - FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MAJOR + file(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MAJOR REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+[0-9]+.*$") - FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MINOR + file(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MINOR REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+[0-9]+.*$") - FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_PATCH + file(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_PATCH REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_PATCH[ \t]+[0-9]+.*$") - STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+([.0-9]+).*" + string(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+([.0-9]+).*" "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR}) - STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*" + string(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*" "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR}) - STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_PATCH[ \t]+([.0-9]+).*" + string(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_PATCH[ \t]+([.0-9]+).*" "\\1" OSL_LIBRARY_VERSION_PATCH ${OSL_LIBRARY_VERSION_PATCH}) -ENDIF() +endif() -MARK_AS_ADVANCED( +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() +foreach(COMPONENT ${_osl_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + mark_as_advanced(OSL_${UPPERCOMPONENT}_LIBRARY) +endforeach() diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 755980d6d1c..b7e0cdf289d 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -21,15 +21,15 @@ # /opt/opencollada/COLLADABaseUtils/include/COLLADABUPlatform.h # If `OPENCOLLADA_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENCOLLADA_ROOT_DIR) +if(DEFINED OPENCOLLADA_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENCOLLADA_ROOT_DIR}) - SET(OPENCOLLADA_ROOT_DIR $ENV{OPENCOLLADA_ROOT_DIR}) -ELSE() - SET(OPENCOLLADA_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENCOLLADA_ROOT_DIR}) + set(OPENCOLLADA_ROOT_DIR $ENV{OPENCOLLADA_ROOT_DIR}) +else() + set(OPENCOLLADA_ROOT_DIR "") +endif() -SET(_opencollada_FIND_INCLUDES +set(_opencollada_FIND_INCLUDES COLLADAStreamWriter COLLADABaseUtils COLLADAFramework @@ -37,7 +37,7 @@ SET(_opencollada_FIND_INCLUDES GeneratedSaxParser ) -SET(_opencollada_FIND_COMPONENTS +set(_opencollada_FIND_COMPONENTS OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework @@ -48,23 +48,23 @@ SET(_opencollada_FIND_COMPONENTS # Fedora openCOLLADA package links these statically # note that order is important here or it won't link -SET(_opencollada_FIND_STATIC_COMPONENTS +set(_opencollada_FIND_STATIC_COMPONENTS buffer ftoa UTF ) -SET(_opencollada_SEARCH_DIRS +set(_opencollada_SEARCH_DIRS ${OPENCOLLADA_ROOT_DIR} /opt/lib/opencollada ) -SET(_opencollada_INCLUDES) -FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_opencollada_INCLUDES) +foreach(COMPONENT ${_opencollada_FIND_INCLUDES}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) # need to use this even thouh we are looking for a dir - FIND_FILE(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR + find_file(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR NAMES ${COMPONENT}/include ${COMPONENT} @@ -77,16 +77,16 @@ FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES}) HINTS ${_opencollada_SEARCH_DIRS} ) - MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR) - LIST(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}") -ENDFOREACH() + mark_as_advanced(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR) + list(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}") +endforeach() -SET(_opencollada_LIBRARIES) -FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_opencollada_LIBRARIES) +foreach(COMPONENT ${_opencollada_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY + find_library(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -96,14 +96,14 @@ FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS}) # Ubuntu ppa needs this. lib64/opencollada lib/opencollada ) - MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) - LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() + mark_as_advanced(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) + list(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") +endforeach() -FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +foreach(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY + find_library(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -113,26 +113,26 @@ FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS}) # Ubuntu ppa needs this. lib64/opencollada lib/opencollada ) - MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) - IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) - LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") - ENDIF() -ENDFOREACH() + mark_as_advanced(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) + if(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) + list(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") + endif() +endforeach() # handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenCOLLADA DEFAULT_MSG _opencollada_LIBRARIES _opencollada_INCLUDES) -IF(OPENCOLLADA_FOUND) - SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES}) - SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES}) -ENDIF() +if(OPENCOLLADA_FOUND) + set(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES}) + set(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES}) +endif() -UNSET(COMPONENT) -UNSET(UPPERCOMPONENT) -UNSET(_opencollada_LIBRARIES) -UNSET(_opencollada_INCLUDES) +unset(COMPONENT) +unset(UPPERCOMPONENT) +unset(_opencollada_LIBRARIES) +unset(_opencollada_INCLUDES) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index df15ebdd4ea..7a2b1c87276 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -16,15 +16,15 @@ # OPENCOLORIO_LIBRARY, where to find the OpenColorIO library. # If `OPENCOLORIO_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENCOLORIO_ROOT_DIR) +if(DEFINED OPENCOLORIO_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENCOLORIO_ROOT_DIR}) - SET(OPENCOLORIO_ROOT_DIR $ENV{OPENCOLORIO_ROOT_DIR}) -ELSE() - SET(OPENCOLORIO_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENCOLORIO_ROOT_DIR}) + set(OPENCOLORIO_ROOT_DIR $ENV{OPENCOLORIO_ROOT_DIR}) +else() + set(OPENCOLORIO_ROOT_DIR "") +endif() -SET(_opencolorio_FIND_COMPONENTS +set(_opencolorio_FIND_COMPONENTS OpenColorIO yaml-cpp expat @@ -32,12 +32,12 @@ SET(_opencolorio_FIND_COMPONENTS minizip ) -SET(_opencolorio_SEARCH_DIRS +set(_opencolorio_SEARCH_DIRS ${OPENCOLORIO_ROOT_DIR} /opt/lib/ocio ) -FIND_PATH(OPENCOLORIO_INCLUDE_DIR +find_path(OPENCOLORIO_INCLUDE_DIR NAMES OpenColorIO/OpenColorIO.h HINTS @@ -46,11 +46,11 @@ FIND_PATH(OPENCOLORIO_INCLUDE_DIR include ) -SET(_opencolorio_LIBRARIES) -FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_opencolorio_LIBRARIES) +foreach(COMPONENT ${_opencolorio_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY + find_library(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -58,47 +58,47 @@ FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib lib64/static lib/static ) - IF(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) - LIST(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}") - ENDIF() -ENDFOREACH() + if(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) + list(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}") + endif() +endforeach() -IF(EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h") +if(EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h") # Search twice, because this symbol changed between OCIO 1.x and 2.x - FILE(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" _opencolorio_version + file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" _opencolorio_version REGEX "^#define OCIO_VERSION_STR[ \t].*$") - IF(NOT _opencolorio_version) + if(NOT _opencolorio_version) file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" _opencolorio_version REGEX "^#define OCIO_VERSION[ \t].*$") - ENDIF() - STRING(REGEX MATCHALL "[0-9]+[.0-9]+" OPENCOLORIO_VERSION ${_opencolorio_version}) -ENDIF() + endif() + string(REGEX MATCHALL "[0-9]+[.0-9]+" OPENCOLORIO_VERSION ${_opencolorio_version}) +endif() # handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenColorIO REQUIRED_VARS _opencolorio_LIBRARIES OPENCOLORIO_INCLUDE_DIR VERSION_VAR OPENCOLORIO_VERSION) -IF(OPENCOLORIO_FOUND) - SET(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES}) - SET(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_INCLUDE_DIR}) -ENDIF() +if(OPENCOLORIO_FOUND) + set(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES}) + set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENCOLORIO_INCLUDE_DIR OPENCOLORIO_LIBRARY OPENCOLORIO_VERSION ) -FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - MARK_AS_ADVANCED(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) -ENDFOREACH() +foreach(COMPONENT ${_opencolorio_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + mark_as_advanced(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) +endforeach() -UNSET(COMPONENT) -UNSET(UPPERCOMPONENT) -UNSET(_opencolorio_FIND_COMPONENTS) -UNSET(_opencolorio_LIBRARIES) -UNSET(_opencolorio_SEARCH_DIRS) +unset(COMPONENT) +unset(UPPERCOMPONENT) +unset(_opencolorio_FIND_COMPONENTS) +unset(_opencolorio_LIBRARIES) +unset(_opencolorio_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 10ab596c8b3..2b23726258f 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -23,24 +23,24 @@ # OPENEXR_LIBRARY, where to find the OpenEXR library. # If `OPENEXR_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENEXR_ROOT_DIR) +if(DEFINED OPENEXR_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENEXR_ROOT_DIR}) - SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR}) -ELSE() - SET(OPENEXR_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENEXR_ROOT_DIR}) + set(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR}) +else() + set(OPENEXR_ROOT_DIR "") +endif() # Old versions (before 2.0?) do not have any version string, # just assuming this should be fine though. -SET(_openexr_libs_ver_init "2.0") +set(_openexr_libs_ver_init "2.0") -SET(_openexr_SEARCH_DIRS +set(_openexr_SEARCH_DIRS ${OPENEXR_ROOT_DIR} /opt/lib/openexr ) -FIND_PATH(OPENEXR_INCLUDE_DIR +find_path(OPENEXR_INCLUDE_DIR NAMES OpenEXR/ImfXdr.h HINTS @@ -50,10 +50,10 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ) # If the headers were found, get the version from config file, if not already set. -IF(OPENEXR_INCLUDE_DIR) - IF(NOT OPENEXR_VERSION) +if(OPENEXR_INCLUDE_DIR) + if(NOT OPENEXR_VERSION) - FIND_FILE(_openexr_CONFIG + find_file(_openexr_CONFIG NAMES OpenEXRConfig.h PATHS @@ -62,54 +62,54 @@ IF(OPENEXR_INCLUDE_DIR) NO_DEFAULT_PATH ) - IF(_openexr_CONFIG) - FILE(STRINGS "${_openexr_CONFIG}" OPENEXR_BUILD_SPECIFICATION + if(_openexr_CONFIG) + file(STRINGS "${_openexr_CONFIG}" OPENEXR_BUILD_SPECIFICATION REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$") - ELSE() - MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${OPENEXR_INCLUDE_DIR}\"") - ENDIF() + else() + message(WARNING "Could not find \"OpenEXRConfig.h\" in \"${OPENEXR_INCLUDE_DIR}\"") + endif() - IF(OPENEXR_BUILD_SPECIFICATION) - MESSAGE(STATUS "${OPENEXR_BUILD_SPECIFICATION}") - STRING(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*" + if(OPENEXR_BUILD_SPECIFICATION) + message(STATUS "${OPENEXR_BUILD_SPECIFICATION}") + string(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*" "\\1" _openexr_libs_ver_init ${OPENEXR_BUILD_SPECIFICATION}) - ELSE() - MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_openexr_libs_ver_init}.") - ENDIF() + else() + message(WARNING "Could not determine ILMBase library version, assuming ${_openexr_libs_ver_init}.") + endif() - UNSET(_openexr_CONFIG CACHE) + unset(_openexr_CONFIG CACHE) - ENDIF() -ENDIF() + endif() +endif() -SET("OPENEXR_VERSION" ${_openexr_libs_ver_init} CACHE STRING "Version of OpenEXR lib") -UNSET(_openexr_libs_ver_init) +set("OPENEXR_VERSION" ${_openexr_libs_ver_init} CACHE STRING "Version of OpenEXR lib") +unset(_openexr_libs_ver_init) -STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION}) +string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION}) # Different library names in 3.0, and Imath and Half moved out. -IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") - SET(_openexr_FIND_COMPONENTS +if(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") + set(_openexr_FIND_COMPONENTS Iex OpenEXR OpenEXRCore IlmThread ) -ELSE() - SET(_openexr_FIND_COMPONENTS +else() + set(_openexr_FIND_COMPONENTS Half Iex IlmImf IlmThread Imath ) -ENDIF() +endif() -SET(_openexr_LIBRARIES) -FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_openexr_LIBRARIES) +foreach(COMPONENT ${_openexr_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY + find_library(OPENEXR_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT} NAMES_PER_DIR @@ -118,18 +118,18 @@ FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() + list(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}") +endforeach() -UNSET(_openexr_libs_ver) +unset(_openexr_libs_ver) -IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") +if(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") # For OpenEXR 3.x, we also need to find the now separate Imath library. # For simplicity we also add it to the OpenEXR includes and libraries, # as it's simpler to support both 2.x and 3.x this way. # Find include directory - FIND_PATH(IMATH_INCLUDE_DIR + find_path(IMATH_INCLUDE_DIR NAMES Imath/ImathMath.h HINTS @@ -139,7 +139,7 @@ IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") ) # Find version - FIND_FILE(_imath_config + find_file(_imath_config NAMES ImathConfig.h PATHS @@ -148,14 +148,14 @@ IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") ) # Find line with version, extract string, and format for library suffix. - FILE(STRINGS "${_imath_config}" _imath_build_specification + file(STRINGS "${_imath_config}" _imath_build_specification REGEX "^[ \t]*#define[ \t]+IMATH_VERSION_STRING[ \t]+\"[.0-9]+\".*$") - STRING(REGEX REPLACE ".*#define[ \t]+IMATH_VERSION_STRING[ \t]+\"([.0-9]+)\".*" + string(REGEX REPLACE ".*#define[ \t]+IMATH_VERSION_STRING[ \t]+\"([.0-9]+)\".*" "\\1" _imath_libs_ver ${_imath_build_specification}) - STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _imath_libs_ver ${_imath_libs_ver}) + string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _imath_libs_ver ${_imath_libs_ver}) # Find library, with or without version number. - FIND_LIBRARY(IMATH_LIBRARY + find_library(IMATH_LIBRARY NAMES Imath-${_imath_libs_ver} Imath NAMES_PER_DIR @@ -164,57 +164,57 @@ IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") PATH_SUFFIXES lib64 lib ) - LIST(APPEND _openexr_LIBRARIES "${IMATH_LIBRARY}") + list(APPEND _openexr_LIBRARIES "${IMATH_LIBRARY}") # In cmake version 3.21 and up, we can instead use the NO_CACHE option for # FIND_FILE so we don't need to clear it from the cache here. - UNSET(_imath_config CACHE) - UNSET(_imath_libs_ver) - UNSET(_imath_build_specification) -ENDIF() + unset(_imath_config CACHE) + unset(_imath_libs_ver) + unset(_imath_build_specification) +endif() -IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") - SET(IMATH_LIBRARIES ${IMATH_LIBRARY}) -ELSE() - SET(IMATH_LIBRARIES ${OPENEXR_IMATH_LIBRARY}) -ENDIF() +if(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") + set(IMATH_LIBRARIES ${IMATH_LIBRARY}) +else() + set(IMATH_LIBRARIES ${OPENEXR_IMATH_LIBRARY}) +endif() # handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenEXR DEFAULT_MSG _openexr_LIBRARIES OPENEXR_INCLUDE_DIR) -IF(OPENEXR_FOUND) - SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES}) +if(OPENEXR_FOUND) + set(OPENEXR_LIBRARIES ${_openexr_LIBRARIES}) # Both include paths are needed because of dummy OSL headers mixing # #include and #include , as well as Alembic # include directly. - SET(OPENEXR_INCLUDE_DIRS + set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR) - IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") - LIST(APPEND OPENEXR_INCLUDE_DIRS + if(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") + list(APPEND OPENEXR_INCLUDE_DIRS ${IMATH_INCLUDE_DIR} ${IMATH_INCLUDE_DIR}/Imath) - ENDIF() -ENDIF() + endif() +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENEXR_INCLUDE_DIR OPENEXR_VERSION IMATH_INCLUDE_DIR IMATH_LIBRARY IMATH_LIBRARIES ) -FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY) -ENDFOREACH() +foreach(COMPONENT ${_openexr_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + mark_as_advanced(OPENEXR_${UPPERCOMPONENT}_LIBRARY) +endforeach() -UNSET(COMPONENT) -UNSET(UPPERCOMPONENT) -UNSET(_openexr_FIND_COMPONENTS) -UNSET(_openexr_LIBRARIES) -UNSET(_openexr_SEARCH_DIRS) +unset(COMPONENT) +unset(UPPERCOMPONENT) +unset(_openexr_FIND_COMPONENTS) +unset(_openexr_LIBRARIES) +unset(_openexr_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenImageDenoise.cmake b/build_files/cmake/Modules/FindOpenImageDenoise.cmake index 77ed1a075c9..b2bd7ff7d9c 100644 --- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake +++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake @@ -16,20 +16,20 @@ # OPENIMAGEDENOISE_LIBRARY, where to find the OpenImageDenoise library. # If `OPENIMAGEDENOISE_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENIMAGEDENOISE_ROOT_DIR) +if(DEFINED OPENIMAGEDENOISE_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENIMAGEDENOISE_ROOT_DIR}) - SET(OPENIMAGEDENOISE_ROOT_DIR $ENV{OPENIMAGEDENOISE_ROOT_DIR}) -ELSE() - SET(OPENIMAGEDENOISE_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENIMAGEDENOISE_ROOT_DIR}) + set(OPENIMAGEDENOISE_ROOT_DIR $ENV{OPENIMAGEDENOISE_ROOT_DIR}) +else() + set(OPENIMAGEDENOISE_ROOT_DIR "") +endif() -SET(_openimagedenoise_SEARCH_DIRS +set(_openimagedenoise_SEARCH_DIRS ${OPENIMAGEDENOISE_ROOT_DIR} /opt/lib/openimagedenoise ) -FIND_PATH(OPENIMAGEDENOISE_INCLUDE_DIR +find_path(OPENIMAGEDENOISE_INCLUDE_DIR NAMES OpenImageDenoise/oidn.h HINTS @@ -38,12 +38,12 @@ FIND_PATH(OPENIMAGEDENOISE_INCLUDE_DIR include ) -SET(_openimagedenoise_FIND_COMPONENTS +set(_openimagedenoise_FIND_COMPONENTS OpenImageDenoise ) # These are needed when building statically -SET(_openimagedenoise_FIND_STATIC_COMPONENTS +set(_openimagedenoise_FIND_STATIC_COMPONENTS common # These additional library names change between versions, we list all of them @@ -55,11 +55,11 @@ SET(_openimagedenoise_FIND_STATIC_COMPONENTS dnnl ) -SET(_openimagedenoise_LIBRARIES) -FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_openimagedenoise_LIBRARIES) +foreach(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY + find_library(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -67,13 +67,13 @@ FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - LIST(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() + list(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}") +endforeach() -FOREACH(COMPONENT ${_openimagedenoise_FIND_STATIC_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +foreach(COMPONENT ${_openimagedenoise_FIND_STATIC_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY + find_library(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -81,13 +81,13 @@ FOREACH(COMPONENT ${_openimagedenoise_FIND_STATIC_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - MARK_AS_ADVANCED(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) - IF(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) - LIST(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}") - ENDIF() -ENDFOREACH() + mark_as_advanced(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) + if(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) + list(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}") + endif() +endforeach() -FIND_LIBRARY(OPENIMAGEDENOISE_LIBRARY +find_library(OPENIMAGEDENOISE_LIBRARY NAMES OpenImageDenoise HINTS @@ -98,27 +98,27 @@ FIND_LIBRARY(OPENIMAGEDENOISE_LIBRARY # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEDENOISE_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageDenoise DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenImageDenoise DEFAULT_MSG OPENIMAGEDENOISE_LIBRARY OPENIMAGEDENOISE_INCLUDE_DIR) -IF(OPENIMAGEDENOISE_FOUND) - SET(OPENIMAGEDENOISE_LIBRARIES ${_openimagedenoise_LIBRARIES}) - SET(OPENIMAGEDENOISE_INCLUDE_DIRS ${OPENIMAGEDENOISE_INCLUDE_DIR}) -ELSE() - SET(OPENIMAGEDENOISE_FOUND FALSE) -ENDIF() +if(OPENIMAGEDENOISE_FOUND) + set(OPENIMAGEDENOISE_LIBRARIES ${_openimagedenoise_LIBRARIES}) + set(OPENIMAGEDENOISE_INCLUDE_DIRS ${OPENIMAGEDENOISE_INCLUDE_DIR}) +else() + set(OPENIMAGEDENOISE_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENIMAGEDENOISE_INCLUDE_DIR OPENIMAGEDENOISE_LIBRARY ) -FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - MARK_AS_ADVANCED(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) -ENDFOREACH() +foreach(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + mark_as_advanced(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY) +endforeach() -UNSET(_openimagedenoise_SEARCH_DIRS) -UNSET(_openimagedenoise_FIND_COMPONENTS) -UNSET(_openimagedenoise_LIBRARIES) +unset(_openimagedenoise_SEARCH_DIRS) +unset(_openimagedenoise_FIND_COMPONENTS) +unset(_openimagedenoise_LIBRARIES) diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 996497c05ee..094f2d3860e 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -18,20 +18,20 @@ # OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library. # If `OPENIMAGEIO_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENIMAGEIO_ROOT_DIR) +if(DEFINED OPENIMAGEIO_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENIMAGEIO_ROOT_DIR}) - SET(OPENIMAGEIO_ROOT_DIR $ENV{OPENIMAGEIO_ROOT_DIR}) -ELSE() - SET(OPENIMAGEIO_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENIMAGEIO_ROOT_DIR}) + set(OPENIMAGEIO_ROOT_DIR $ENV{OPENIMAGEIO_ROOT_DIR}) +else() + set(OPENIMAGEIO_ROOT_DIR "") +endif() -SET(_openimageio_SEARCH_DIRS +set(_openimageio_SEARCH_DIRS ${OPENIMAGEIO_ROOT_DIR} /opt/lib/oiio ) -FIND_PATH(OPENIMAGEIO_INCLUDE_DIR +find_path(OPENIMAGEIO_INCLUDE_DIR NAMES OpenImageIO/imageio.h HINTS @@ -40,7 +40,7 @@ FIND_PATH(OPENIMAGEIO_INCLUDE_DIR include ) -FIND_LIBRARY(OPENIMAGEIO_LIBRARY +find_library(OPENIMAGEIO_LIBRARY NAMES OpenImageIO HINTS @@ -51,7 +51,7 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY set(_openimageio_LIBRARIES ${OPENIMAGEIO_LIBRARY}) -FIND_FILE(OPENIMAGEIO_IDIFF +find_file(OPENIMAGEIO_IDIFF NAMES idiff HINTS @@ -63,7 +63,7 @@ FIND_FILE(OPENIMAGEIO_IDIFF # Additionally find util library if needed. In old versions this library was # included in libOpenImageIO and linking to both would duplicate symbols. In # new versions we need to link to both. -FIND_FILE(_openimageio_export +find_file(_openimageio_export NAMES export.h PATHS @@ -72,11 +72,11 @@ FIND_FILE(_openimageio_export ) # Use existence of OIIO_UTIL_API to check if it's a separate lib. -FILE(STRINGS "${_openimageio_export}" _openimageio_util_define +file(STRINGS "${_openimageio_export}" _openimageio_util_define REGEX "^[ \t]*#[ \t]*define[ \t]+OIIO_UTIL_API.*$") -IF(_openimageio_util_define) - FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY +if(_openimageio_util_define) + find_library(OPENIMAGEIO_UTIL_LIBRARY NAMES OpenImageIO_Util HINTS @@ -85,38 +85,38 @@ IF(_openimageio_util_define) lib64 lib ) - LIST(APPEND _openimageio_LIBRARIES ${OPENIMAGEIO_UTIL_LIBRARY}) -ENDIF() + list(APPEND _openimageio_LIBRARIES ${OPENIMAGEIO_UTIL_LIBRARY}) +endif() # In cmake version 3.21 and up, we can instead use the NO_CACHE option for # FIND_FILE so we don't need to clear it from the cache here. -UNSET(_openimageio_export CACHE) -UNSET(_openimageio_util_define) +unset(_openimageio_export CACHE) +unset(_openimageio_util_define) # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenImageIO DEFAULT_MSG _openimageio_LIBRARIES OPENIMAGEIO_INCLUDE_DIR) -IF(OPENIMAGEIO_FOUND) - SET(OPENIMAGEIO_LIBRARIES ${_openimageio_LIBRARIES}) - SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) - IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp) - SET(OPENIMAGEIO_PUGIXML_FOUND TRUE) - ELSE() - SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) - ENDIF() -ELSE() - SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) -ENDIF() +if(OPENIMAGEIO_FOUND) + set(OPENIMAGEIO_LIBRARIES ${_openimageio_LIBRARIES}) + set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) + if(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp) + set(OPENIMAGEIO_PUGIXML_FOUND TRUE) + else() + set(OPENIMAGEIO_PUGIXML_FOUND FALSE) + endif() +else() + set(OPENIMAGEIO_PUGIXML_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENIMAGEIO_INCLUDE_DIR OPENIMAGEIO_LIBRARY OPENIMAGEIO_UTIL_LIBRARY OPENIMAGEIO_IDIFF ) -UNSET(_openimageio_SEARCH_DIRS) -UNSET(_openimageio_LIBRARIES) +unset(_openimageio_SEARCH_DIRS) +unset(_openimageio_LIBRARIES) diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index c05c7e26106..cab875f4cbe 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -16,19 +16,19 @@ # OPENJPEG_LIBRARY, where to find the OpenJPEG library. # If `OPENJPEG_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENJPEG_ROOT_DIR) +if(DEFINED OPENJPEG_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENJPEG_ROOT_DIR}) - SET(OPENJPEG_ROOT_DIR $ENV{OPENJPEG_ROOT_DIR}) -ELSE() - SET(OPENJPEG_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENJPEG_ROOT_DIR}) + set(OPENJPEG_ROOT_DIR $ENV{OPENJPEG_ROOT_DIR}) +else() + set(OPENJPEG_ROOT_DIR "") +endif() -SET(_openjpeg_SEARCH_DIRS +set(_openjpeg_SEARCH_DIRS ${OPENJPEG_ROOT_DIR} ) -FIND_PATH(OPENJPEG_INCLUDE_DIR +find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h HINTS @@ -48,7 +48,7 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg-2.0 ) -FIND_LIBRARY(OPENJPEG_LIBRARY +find_library(OPENJPEG_LIBRARY NAMES openjp2 HINTS @@ -59,18 +59,18 @@ FIND_LIBRARY(OPENJPEG_LIBRARY # handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenJPEG DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenJPEG DEFAULT_MSG OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) -IF(OPENJPEG_FOUND) - SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) - SET(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) -ENDIF() +if(OPENJPEG_FOUND) + set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) + set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENJPEG_INCLUDE_DIR OPENJPEG_LIBRARY ) -UNSET(_openjpeg_SEARCH_DIRS) +unset(_openjpeg_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake index 998fc4d4cb2..e7e392f4870 100644 --- a/build_files/cmake/Modules/FindOpenSubdiv.cmake +++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake @@ -13,26 +13,26 @@ # OPENSUBDIV_FOUND, if false, do not try to use OpenSubdiv. # If `OPENSUBDIV_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENSUBDIV_ROOT_DIR) +if(DEFINED OPENSUBDIV_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENSUBDIV_ROOT_DIR}) - SET(OPENSUBDIV_ROOT_DIR $ENV{OPENSUBDIV_ROOT_DIR}) -ELSE() - SET(OPENSUBDIV_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENSUBDIV_ROOT_DIR}) + set(OPENSUBDIV_ROOT_DIR $ENV{OPENSUBDIV_ROOT_DIR}) +else() + set(OPENSUBDIV_ROOT_DIR "") +endif() -SET(_opensubdiv_FIND_COMPONENTS +set(_opensubdiv_FIND_COMPONENTS osdGPU osdCPU ) -SET(_opensubdiv_SEARCH_DIRS +set(_opensubdiv_SEARCH_DIRS ${OPENSUBDIV_ROOT_DIR} /opt/lib/opensubdiv /opt/lib/osd # install_deps.sh ) -FIND_PATH(OPENSUBDIV_INCLUDE_DIR +find_path(OPENSUBDIV_INCLUDE_DIR NAMES opensubdiv/osd/mesh.h HINTS @@ -41,11 +41,11 @@ FIND_PATH(OPENSUBDIV_INCLUDE_DIR include ) -SET(_opensubdiv_LIBRARIES) -FOREACH(COMPONENT ${_opensubdiv_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_opensubdiv_LIBRARIES) +foreach(COMPONENT ${_opensubdiv_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY + find_library(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} HINTS @@ -53,35 +53,35 @@ FOREACH(COMPONENT ${_opensubdiv_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - LIST(APPEND _opensubdiv_LIBRARIES "${OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() + list(APPEND _opensubdiv_LIBRARIES "${OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY}") +endforeach() -MACRO(OPENSUBDIV_CHECK_CONTROLLER +macro(OPENSUBDIV_CHECK_CONTROLLER controller_include_file variable_name) - IF(EXISTS "${OPENSUBDIV_INCLUDE_DIR}/opensubdiv/osd/${controller_include_file}") - SET(${variable_name} TRUE) - ELSE() - SET(${variable_name} FALSE) - ENDIF() -ENDMACRO() + if(EXISTS "${OPENSUBDIV_INCLUDE_DIR}/opensubdiv/osd/${controller_include_file}") + set(${variable_name} TRUE) + else() + set(${variable_name} FALSE) + endif() +endmacro() # handle the QUIETLY and REQUIRED arguments and set OPENSUBDIV_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSubdiv DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenSubdiv DEFAULT_MSG _opensubdiv_LIBRARIES OPENSUBDIV_INCLUDE_DIR) -IF(OPENSUBDIV_FOUND) - SET(OPENSUBDIV_LIBRARIES ${_opensubdiv_LIBRARIES}) - SET(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR}) -ENDIF() +if(OPENSUBDIV_FOUND) + set(OPENSUBDIV_LIBRARIES ${_opensubdiv_LIBRARIES}) + set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENSUBDIV_INCLUDE_DIR ) -FOREACH(COMPONENT ${_opensubdiv_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - MARK_AS_ADVANCED(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY) -ENDFOREACH() +foreach(COMPONENT ${_opensubdiv_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + mark_as_advanced(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY) +endforeach() diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake index 176df8090f7..ede311090fe 100644 --- a/build_files/cmake/Modules/FindOpenVDB.cmake +++ b/build_files/cmake/Modules/FindOpenVDB.cmake @@ -16,20 +16,20 @@ # OPENVDB_LIBRARY, where to find the OPENVDB library. # If `OPENVDB_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPENVDB_ROOT_DIR) +if(DEFINED OPENVDB_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPENVDB_ROOT_DIR}) - SET(OPENVDB_ROOT_DIR $ENV{OPENVDB_ROOT_DIR}) -ELSE() - SET(OPENVDB_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPENVDB_ROOT_DIR}) + set(OPENVDB_ROOT_DIR $ENV{OPENVDB_ROOT_DIR}) +else() + set(OPENVDB_ROOT_DIR "") +endif() -SET(_openvdb_SEARCH_DIRS +set(_openvdb_SEARCH_DIRS ${OPENVDB_ROOT_DIR} /opt/lib/openvdb ) -FIND_PATH(OPENVDB_INCLUDE_DIR +find_path(OPENVDB_INCLUDE_DIR NAMES openvdb/openvdb.h HINTS @@ -38,7 +38,7 @@ FIND_PATH(OPENVDB_INCLUDE_DIR include ) -FIND_LIBRARY(OPENVDB_LIBRARY +find_library(OPENVDB_LIBRARY NAMES openvdb HINTS @@ -49,18 +49,18 @@ FIND_LIBRARY(OPENVDB_LIBRARY # handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenVDB DEFAULT_MSG OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR) -IF(OPENVDB_FOUND) - SET(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY}) - SET(OPENVDB_INCLUDE_DIRS ${OPENVDB_INCLUDE_DIR}) -ENDIF() +if(OPENVDB_FOUND) + set(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY}) + set(OPENVDB_INCLUDE_DIRS ${OPENVDB_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPENVDB_INCLUDE_DIR OPENVDB_LIBRARY ) -UNSET(_openvdb_SEARCH_DIRS) +unset(_openvdb_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOptiX.cmake b/build_files/cmake/Modules/FindOptiX.cmake index c6d340e580b..ee6fd50862a 100644 --- a/build_files/cmake/Modules/FindOptiX.cmake +++ b/build_files/cmake/Modules/FindOptiX.cmake @@ -12,15 +12,15 @@ # OPTIX_FOUND, If false, do not try to use OptiX. # If `OPTIX_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED OPTIX_ROOT_DIR) +if(DEFINED OPTIX_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{OPTIX_ROOT_DIR}) - SET(OPTIX_ROOT_DIR $ENV{OPTIX_ROOT_DIR}) -ELSE() - SET(OPTIX_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{OPTIX_ROOT_DIR}) + set(OPTIX_ROOT_DIR $ENV{OPTIX_ROOT_DIR}) +else() + set(OPTIX_ROOT_DIR "") +endif() -SET(_optix_SEARCH_DIRS +set(_optix_SEARCH_DIRS ${OPTIX_ROOT_DIR} ) @@ -29,7 +29,7 @@ if(DEFINED ENV{PROGRAMDATA}) list(APPEND _optix_SEARCH_DIRS "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.3.0") endif() -FIND_PATH(OPTIX_INCLUDE_DIR +find_path(OPTIX_INCLUDE_DIR NAMES optix.h HINTS @@ -38,31 +38,31 @@ FIND_PATH(OPTIX_INCLUDE_DIR include ) -IF(EXISTS "${OPTIX_INCLUDE_DIR}/optix.h") - FILE(STRINGS "${OPTIX_INCLUDE_DIR}/optix.h" _optix_version REGEX "^#define OPTIX_VERSION[ \t].*$") - STRING(REGEX MATCHALL "[0-9]+" _optix_version ${_optix_version}) +if(EXISTS "${OPTIX_INCLUDE_DIR}/optix.h") + file(STRINGS "${OPTIX_INCLUDE_DIR}/optix.h" _optix_version REGEX "^#define OPTIX_VERSION[ \t].*$") + string(REGEX MATCHALL "[0-9]+" _optix_version ${_optix_version}) - MATH(EXPR _optix_version_major "${_optix_version} / 10000") - MATH(EXPR _optix_version_minor "(${_optix_version} % 10000) / 100") - MATH(EXPR _optix_version_patch "${_optix_version} % 100") + math(EXPR _optix_version_major "${_optix_version} / 10000") + math(EXPR _optix_version_minor "(${_optix_version} % 10000) / 100") + math(EXPR _optix_version_patch "${_optix_version} % 100") - SET(OPTIX_VERSION "${_optix_version_major}.${_optix_version_minor}.${_optix_version_patch}") -ENDIF() + set(OPTIX_VERSION "${_optix_version_major}.${_optix_version_minor}.${_optix_version_patch}") +endif() # handle the QUIETLY and REQUIRED arguments and set OPTIX_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OptiX +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OptiX REQUIRED_VARS OPTIX_INCLUDE_DIR VERSION_VAR OPTIX_VERSION) -IF(OPTIX_FOUND) - SET(OPTIX_INCLUDE_DIRS ${OPTIX_INCLUDE_DIR}) -ENDIF() +if(OPTIX_FOUND) + set(OPTIX_INCLUDE_DIRS ${OPTIX_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( OPTIX_INCLUDE_DIR OPTIX_VERSION ) -UNSET(_optix_SEARCH_DIRS) +unset(_optix_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index 5397b3dd3a1..fa1c010015a 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -16,26 +16,26 @@ # PCRE_LIBRARY, where to find the PCRE library. # If `PCRE_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED PCRE_ROOT_DIR) +if(DEFINED PCRE_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{PCRE_ROOT_DIR}) - SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR}) -ELSE() - SET(PCRE_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{PCRE_ROOT_DIR}) + set(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR}) +else() + set(PCRE_ROOT_DIR "") +endif() -SET(_pcre_SEARCH_DIRS +set(_pcre_SEARCH_DIRS ${PCRE_ROOT_DIR} ) -FIND_PATH(PCRE_INCLUDE_DIR pcre.h +find_path(PCRE_INCLUDE_DIR pcre.h HINTS ${_pcre_SEARCH_DIRS} PATH_SUFFIXES include ) -FIND_LIBRARY(PCRE_LIBRARY +find_library(PCRE_LIBRARY NAMES pcre HINTS @@ -46,21 +46,21 @@ FIND_LIBRARY(PCRE_LIBRARY # handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR) # With 'make deps' precompiled libs, opencollada ships with a copy of libpcre # but not the headers, ${PCRE_LIBRARY} will be valid in this case # but PCRE_FOUND will be FALSE. So we set this variable outside of -# the IF(PCRE_FOUND) below to allow blender to successfully link. -SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) +# the `if(PCRE_FOUND)` below to allow blender to successfully link. +set(PCRE_LIBRARIES ${PCRE_LIBRARY}) -IF(PCRE_FOUND) - SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) -ENDIF() +if(PCRE_FOUND) + set(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( PCRE_INCLUDE_DIR PCRE_LIBRARY ) diff --git a/build_files/cmake/Modules/FindPotrace.cmake b/build_files/cmake/Modules/FindPotrace.cmake index 62eef19cc00..e629cb174f2 100644 --- a/build_files/cmake/Modules/FindPotrace.cmake +++ b/build_files/cmake/Modules/FindPotrace.cmake @@ -16,22 +16,22 @@ # POTRACE_LIBRARY, where to find the POTRACE library. # If `POTRACE_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED POTRACE_ROOT_DIR) +if(DEFINED POTRACE_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{POTRACE_ROOT_DIR}) - SET(POTRACE_ROOT_DIR $ENV{POTRACE_ROOT_DIR}) -ELSE() - SET(POTRACE_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{POTRACE_ROOT_DIR}) + set(POTRACE_ROOT_DIR $ENV{POTRACE_ROOT_DIR}) +else() + set(POTRACE_ROOT_DIR "") +endif() -SET(_potrace_SEARCH_DIRS +set(_potrace_SEARCH_DIRS ${POTRACE_ROOT_DIR} /opt/lib/potrace /usr/include /usr/local/include ) -FIND_PATH(POTRACE_INCLUDE_DIR +find_path(POTRACE_INCLUDE_DIR NAMES potracelib.h HINTS @@ -40,7 +40,7 @@ FIND_PATH(POTRACE_INCLUDE_DIR include ) -FIND_LIBRARY(POTRACE_LIBRARY +find_library(POTRACE_LIBRARY NAMES potrace HINTS @@ -51,16 +51,16 @@ FIND_LIBRARY(POTRACE_LIBRARY # 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 +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() +if(POTRACE_FOUND) + set(POTRACE_LIBRARIES ${POTRACE_LIBRARY}) + set(POTRACE_INCLUDE_DIRS ${POTRACE_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( POTRACE_INCLUDE_DIR POTRACE_LIBRARY ) diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index 3a17d914182..fdd6c2b9f0f 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -16,20 +16,20 @@ # PUGIXML_LIBRARY, where to find the PugiXML library. # If `PUGIXML_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED PUGIXML_ROOT_DIR) +if(DEFINED PUGIXML_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{PUGIXML_ROOT_DIR}) - SET(PUGIXML_ROOT_DIR $ENV{PUGIXML_ROOT_DIR}) -ELSE() - SET(PUGIXML_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{PUGIXML_ROOT_DIR}) + set(PUGIXML_ROOT_DIR $ENV{PUGIXML_ROOT_DIR}) +else() + set(PUGIXML_ROOT_DIR "") +endif() -SET(_pugixml_SEARCH_DIRS +set(_pugixml_SEARCH_DIRS ${PUGIXML_ROOT_DIR} /opt/lib/oiio ) -FIND_PATH(PUGIXML_INCLUDE_DIR +find_path(PUGIXML_INCLUDE_DIR NAMES pugixml.hpp HINTS @@ -38,7 +38,7 @@ FIND_PATH(PUGIXML_INCLUDE_DIR include ) -FIND_LIBRARY(PUGIXML_LIBRARY +find_library(PUGIXML_LIBRARY NAMES pugixml HINTS @@ -49,18 +49,18 @@ FIND_LIBRARY(PUGIXML_LIBRARY # handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PugiXML DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PugiXML DEFAULT_MSG PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) -IF(PUGIXML_FOUND) - SET(PUGIXML_LIBRARIES ${PUGIXML_LIBRARY}) - SET(PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR}) -ELSE() - SET(PUGIXML_PUGIXML_FOUND FALSE) -ENDIF() +if(PUGIXML_FOUND) + set(PUGIXML_LIBRARIES ${PUGIXML_LIBRARY}) + set(PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR}) +else() + set(PUGIXML_PUGIXML_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( PUGIXML_INCLUDE_DIR PUGIXML_LIBRARY ) diff --git a/build_files/cmake/Modules/FindPulse.cmake b/build_files/cmake/Modules/FindPulse.cmake index e77fcf0b395..0b7668ffb5f 100644 --- a/build_files/cmake/Modules/FindPulse.cmake +++ b/build_files/cmake/Modules/FindPulse.cmake @@ -16,26 +16,26 @@ # LIBPULSE_LIBRARY, where to find the PulseAudio library. # If `LIBPULSE_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED LIBPULSE_ROOT_DIR) +if(DEFINED LIBPULSE_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{LIBPULSE_ROOT_DIR}) - SET(LIBPULSE_ROOT_DIR $ENV{LIBPULSE_ROOT_DIR}) -ELSE() - SET(LIBPULSE_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{LIBPULSE_ROOT_DIR}) + set(LIBPULSE_ROOT_DIR $ENV{LIBPULSE_ROOT_DIR}) +else() + set(LIBPULSE_ROOT_DIR "") +endif() -SET(_pulse_SEARCH_DIRS +set(_pulse_SEARCH_DIRS ${LIBPULSE_ROOT_DIR} ) -FIND_PATH(LIBPULSE_INCLUDE_DIR pulse/pulseaudio.h +find_path(LIBPULSE_INCLUDE_DIR pulse/pulseaudio.h HINTS ${_pulse_SEARCH_DIRS} PATH_SUFFIXES include ) -FIND_LIBRARY(LIBPULSE_LIBRARY +find_library(LIBPULSE_LIBRARY NAMES pulse HINTS @@ -46,16 +46,16 @@ FIND_LIBRARY(LIBPULSE_LIBRARY # handle the QUIETLY and REQUIRED arguments and set PULSE_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Pulse DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Pulse DEFAULT_MSG LIBPULSE_LIBRARY LIBPULSE_INCLUDE_DIR) -IF(PULSE_FOUND) - SET(LIBPULSE_LIBRARIES ${LIBPULSE_LIBRARY}) - SET(LIBPULSE_INCLUDE_DIRS ${LIBPULSE_INCLUDE_DIR}) -ENDIF() +if(PULSE_FOUND) + set(LIBPULSE_LIBRARIES ${LIBPULSE_LIBRARY}) + set(LIBPULSE_INCLUDE_DIRS ${LIBPULSE_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( LIBPULSE_INCLUDE_DIR LIBPULSE_LIBRARY ) diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 794b39e4d6a..1a42ee5e7d9 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -28,17 +28,17 @@ # PYTHON_LIBRARY, where to find the python library. # If `PYTHON_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED PYTHON_ROOT_DIR) +if(DEFINED PYTHON_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{PYTHON_ROOT_DIR}) - SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR}) -ELSE() - SET(PYTHON_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{PYTHON_ROOT_DIR}) + set(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR}) +else() + set(PYTHON_ROOT_DIR "") +endif() -SET(_PYTHON_VERSION_SUPPORTED 3.10) -SET(PYTHON_VERSION ${_PYTHON_VERSION_SUPPORTED} CACHE STRING "Python Version (major and minor only)") -MARK_AS_ADVANCED(PYTHON_VERSION) +set(_PYTHON_VERSION_SUPPORTED 3.10) +set(PYTHON_VERSION ${_PYTHON_VERSION_SUPPORTED} CACHE STRING "Python Version (major and minor only)") +mark_as_advanced(PYTHON_VERSION) if(APPLE) @@ -49,53 +49,53 @@ if(APPLE) endif() else() # See: http://docs.python.org/extending/embedding.html#linking-requirements - SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for python") - MARK_AS_ADVANCED(PYTHON_LINKFLAGS) + set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for python") + mark_as_advanced(PYTHON_LINKFLAGS) endif() # if the user passes these defines as args, we don't want to overwrite -SET(_IS_INC_DEF OFF) -SET(_IS_INC_CONF_DEF OFF) -SET(_IS_LIB_DEF OFF) -SET(_IS_LIB_PATH_DEF OFF) -IF(DEFINED PYTHON_INCLUDE_DIR) - SET(_IS_INC_DEF ON) -ENDIF() -IF(DEFINED PYTHON_INCLUDE_CONFIG_DIR) - SET(_IS_INC_CONF_DEF ON) -ENDIF() -IF(DEFINED PYTHON_LIBRARY) - SET(_IS_LIB_DEF ON) -ENDIF() -IF(DEFINED PYTHON_LIBPATH) - SET(_IS_LIB_PATH_DEF ON) -ENDIF() +set(_IS_INC_DEF OFF) +set(_IS_INC_CONF_DEF OFF) +set(_IS_LIB_DEF OFF) +set(_IS_LIB_PATH_DEF OFF) +if(DEFINED PYTHON_INCLUDE_DIR) + set(_IS_INC_DEF ON) +endif() +if(DEFINED PYTHON_INCLUDE_CONFIG_DIR) + set(_IS_INC_CONF_DEF ON) +endif() +if(DEFINED PYTHON_LIBRARY) + set(_IS_LIB_DEF ON) +endif() +if(DEFINED PYTHON_LIBPATH) + set(_IS_LIB_PATH_DEF ON) +endif() -STRING(REPLACE "." "" PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) +string(REPLACE "." "" PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) -SET(_PYTHON_ABI_FLAGS "") +set(_PYTHON_ABI_FLAGS "") -SET(_python_SEARCH_DIRS +set(_python_SEARCH_DIRS ${PYTHON_ROOT_DIR} "$ENV{HOME}/py${PYTHON_VERSION_NO_DOTS}" "/opt/lib/python-${PYTHON_VERSION}" ) # only search for the dirs if we haven't already -IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF)) - SET(_PYTHON_ABI_FLAGS_TEST +if((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF)) + set(_PYTHON_ABI_FLAGS_TEST "u; " # release "du;d" # debug ) - FOREACH(_CURRENT_ABI_FLAGS ${_PYTHON_ABI_FLAGS_TEST}) - # IF(CMAKE_BUILD_TYPE STREQUAL Debug) - # SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}") - # ENDIF() - STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS}) + foreach(_CURRENT_ABI_FLAGS ${_PYTHON_ABI_FLAGS_TEST}) + # if(CMAKE_BUILD_TYPE STREQUAL Debug) + # set(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}") + # endif() + string(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS}) - IF(NOT DEFINED PYTHON_INCLUDE_DIR) - FIND_PATH(PYTHON_INCLUDE_DIR + if(NOT DEFINED PYTHON_INCLUDE_DIR) + find_path(PYTHON_INCLUDE_DIR NAMES Python.h HINTS @@ -104,10 +104,10 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} include/${CMAKE_LIBRARY_ARCHITECTURE}/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} ) - ENDIF() + endif() - IF(NOT DEFINED PYTHON_INCLUDE_CONFIG_DIR) - FIND_PATH(PYTHON_INCLUDE_CONFIG_DIR + if(NOT DEFINED PYTHON_INCLUDE_CONFIG_DIR) + find_path(PYTHON_INCLUDE_CONFIG_DIR NAMES pyconfig.h HINTS @@ -116,15 +116,15 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} include/${CMAKE_LIBRARY_ARCHITECTURE}/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} ) - IF((NOT PYTHON_INCLUDE_CONFIG_DIR) AND PYTHON_INCLUDE_DIR) + if((NOT PYTHON_INCLUDE_CONFIG_DIR) AND PYTHON_INCLUDE_DIR) # Fallback... - UNSET(PYTHON_INCLUDE_CONFIG_DIR CACHE) - SET(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR} CACHE PATH "") - ENDIF() - ENDIF() + unset(PYTHON_INCLUDE_CONFIG_DIR CACHE) + set(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR} CACHE PATH "") + endif() + endif() - IF(NOT DEFINED PYTHON_LIBRARY) - FIND_LIBRARY(PYTHON_LIBRARY + if(NOT DEFINED PYTHON_LIBRARY) + find_library(PYTHON_LIBRARY NAMES "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}" HINTS @@ -132,10 +132,10 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ PATH_SUFFIXES lib64 lib ) - ENDIF() + endif() - IF(NOT DEFINED PYTHON_LIBPATH) - FIND_PATH(PYTHON_LIBPATH + if(NOT DEFINED PYTHON_LIBPATH) + find_path(PYTHON_LIBPATH NAMES "python${PYTHON_VERSION}/abc.py" # This is a bit hackish! :/ HINTS @@ -143,48 +143,48 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ PATH_SUFFIXES lib64 lib ) - IF((NOT PYTHON_LIBPATH) AND PYTHON_LIBRARY) + if((NOT PYTHON_LIBPATH) AND PYTHON_LIBRARY) # Fallback... - UNSET(PYTHON_LIBPATH CACHE) - GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH) - ENDIF() - ENDIF() + unset(PYTHON_LIBPATH CACHE) + get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH) + endif() + endif() - IF(PYTHON_LIBRARY AND PYTHON_LIBPATH AND PYTHON_INCLUDE_DIR AND PYTHON_INCLUDE_CONFIG_DIR) - SET(_PYTHON_ABI_FLAGS "${_CURRENT_ABI_FLAGS}") + if(PYTHON_LIBRARY AND PYTHON_LIBPATH AND PYTHON_INCLUDE_DIR AND PYTHON_INCLUDE_CONFIG_DIR) + set(_PYTHON_ABI_FLAGS "${_CURRENT_ABI_FLAGS}") break() - ELSE() + else() # ensure we don't find values from 2 different ABI versions - IF(NOT _IS_INC_DEF) - UNSET(PYTHON_INCLUDE_DIR CACHE) - ENDIF() - IF(NOT _IS_INC_CONF_DEF) - UNSET(PYTHON_INCLUDE_CONFIG_DIR CACHE) - ENDIF() - IF(NOT _IS_LIB_DEF) - UNSET(PYTHON_LIBRARY CACHE) - ENDIF() - IF(NOT _IS_LIB_PATH_DEF) - UNSET(PYTHON_LIBPATH CACHE) - ENDIF() - ENDIF() - ENDFOREACH() + if(NOT _IS_INC_DEF) + unset(PYTHON_INCLUDE_DIR CACHE) + endif() + if(NOT _IS_INC_CONF_DEF) + unset(PYTHON_INCLUDE_CONFIG_DIR CACHE) + endif() + if(NOT _IS_LIB_DEF) + unset(PYTHON_LIBRARY CACHE) + endif() + if(NOT _IS_LIB_PATH_DEF) + unset(PYTHON_LIBPATH CACHE) + endif() + endif() + endforeach() - UNSET(_CURRENT_ABI_FLAGS) - UNSET(_CURRENT_PATH) + unset(_CURRENT_ABI_FLAGS) + unset(_CURRENT_PATH) - UNSET(_PYTHON_ABI_FLAGS_TEST) -ENDIF() + unset(_PYTHON_ABI_FLAGS_TEST) +endif() -UNSET(_IS_INC_DEF) -UNSET(_IS_INC_CONF_DEF) -UNSET(_IS_LIB_DEF) -UNSET(_IS_LIB_PATH_DEF) +unset(_IS_INC_DEF) +unset(_IS_INC_CONF_DEF) +unset(_IS_LIB_DEF) +unset(_IS_LIB_PATH_DEF) # handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PythonLibsUnix # NOTE(@ideasman42): Instead of `DEFAULT_MSG` use a custom message because users # may have newer versions Python and not be using pre-compiled libraries # (on other UNIX systems or using an esoteric architecture). @@ -203,14 +203,14 @@ If you wish to use a newer Python version you may set 'PYTHON_VERSION' \ however we do not guarantee full compatibility in this case." PYTHON_LIBRARY PYTHON_LIBPATH PYTHON_INCLUDE_DIR PYTHON_INCLUDE_CONFIG_DIR) -IF(PYTHONLIBSUNIX_FOUND) +if(PYTHONLIBSUNIX_FOUND) # Assign cache items - SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_CONFIG_DIR}) - IF(NOT WITH_PYTHON_MODULE) - SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY}) - ENDIF() + set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_CONFIG_DIR}) + if(NOT WITH_PYTHON_MODULE) + set(PYTHON_LIBRARIES ${PYTHON_LIBRARY}) + endif() - FIND_FILE(PYTHON_SITE_PACKAGES + find_file(PYTHON_SITE_PACKAGES NAMES # debian specific dist-packages @@ -221,10 +221,10 @@ IF(PYTHONLIBSUNIX_FOUND) # we need this for installation # XXX No more valid with debian-like py3.5 packages... -# GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH) + # get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH) # not required for build, just used when bundling Python. - FIND_PROGRAM( + find_program( PYTHON_EXECUTABLE NAMES "python${PYTHON_VERSION}${_PYTHON_ABI_FLAGS}" @@ -234,13 +234,13 @@ IF(PYTHONLIBSUNIX_FOUND) ${_python_SEARCH_DIRS} PATH_SUFFIXES bin ) -ENDIF() +endif() -UNSET(_PYTHON_ABI_FLAGS) -UNSET(_PYTHON_VERSION_SUPPORTED) -UNSET(_python_SEARCH_DIRS) +unset(_PYTHON_ABI_FLAGS) +unset(_PYTHON_VERSION_SUPPORTED) +unset(_python_SEARCH_DIRS) -MARK_AS_ADVANCED( +mark_as_advanced( PYTHON_INCLUDE_DIR PYTHON_INCLUDE_CONFIG_DIR PYTHON_LIBRARY diff --git a/build_files/cmake/Modules/FindSDL2.cmake b/build_files/cmake/Modules/FindSDL2.cmake index 8cf972aada5..4c90e0acfa6 100644 --- a/build_files/cmake/Modules/FindSDL2.cmake +++ b/build_files/cmake/Modules/FindSDL2.cmake @@ -15,19 +15,19 @@ # SDL2_LIBRARY, where to find the SDL library. # If `SDL2_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED SDL2_ROOT_DIR) +if(DEFINED SDL2_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{SDL2_ROOT_DIR}) - SET(SDL2_ROOT_DIR $ENV{SDL2_ROOT_DIR}) -ELSE() - SET(SDL2_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{SDL2_ROOT_DIR}) + set(SDL2_ROOT_DIR $ENV{SDL2_ROOT_DIR}) +else() + set(SDL2_ROOT_DIR "") +endif() -SET(_sdl2_SEARCH_DIRS +set(_sdl2_SEARCH_DIRS ${SDL2_ROOT_DIR} ) -FIND_PATH(SDL2_INCLUDE_DIR +find_path(SDL2_INCLUDE_DIR NAMES SDL.h HINTS @@ -36,7 +36,7 @@ FIND_PATH(SDL2_INCLUDE_DIR include/SDL2 include SDL2 ) -FIND_LIBRARY(SDL2_LIBRARY +find_library(SDL2_LIBRARY NAMES SDL2 HINTS @@ -47,16 +47,16 @@ FIND_LIBRARY(SDL2_LIBRARY # handle the QUIETLY and REQUIRED arguments and set SDL2_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SDL2 DEFAULT_MSG SDL2_LIBRARY SDL2_INCLUDE_DIR) -IF(SDL2_FOUND) - SET(SDL2_LIBRARIES ${SDL2_LIBRARY}) - SET(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) -ENDIF() +if(SDL2_FOUND) + set(SDL2_LIBRARIES ${SDL2_LIBRARY}) + set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( SDL2_INCLUDE_DIR SDL2_LIBRARY ) diff --git a/build_files/cmake/Modules/FindSYCL.cmake b/build_files/cmake/Modules/FindSYCL.cmake index 0f05b5ca5f5..71e73375bfd 100644 --- a/build_files/cmake/Modules/FindSYCL.cmake +++ b/build_files/cmake/Modules/FindSYCL.cmake @@ -12,11 +12,11 @@ # This can also be an environment variable. # SYCL_FOUND, If false, then don't try to use SYCL. -IF(NOT SYCL_ROOT_DIR AND NOT $ENV{SYCL_ROOT_DIR} STREQUAL "") - SET(SYCL_ROOT_DIR $ENV{SYCL_ROOT_DIR}) -ENDIF() +if(NOT 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 @@ -29,7 +29,7 @@ SET(_sycl_search_dirs # CLang start with looking for either dpcpp or clang binary in the given # list of search paths only. If that fails, try to look for a system-wide # dpcpp binary. -FIND_PROGRAM(SYCL_COMPILER +find_program(SYCL_COMPILER NAMES icpx dpcpp @@ -45,7 +45,7 @@ FIND_PROGRAM(SYCL_COMPILER # NOTE: No clang++ here so that we do not pick up a system-wide CLang # compiler. if(NOT SYCL_COMPILER) - FIND_PROGRAM(SYCL_COMPILER + find_program(SYCL_COMPILER NAMES icpx dpcpp @@ -56,7 +56,7 @@ if(NOT SYCL_COMPILER) ) endif() -FIND_LIBRARY(SYCL_LIBRARY +find_library(SYCL_LIBRARY NAMES sycl7 sycl6 @@ -68,7 +68,7 @@ FIND_LIBRARY(SYCL_LIBRARY ) if(WIN32) - FIND_LIBRARY(SYCL_LIBRARY_DEBUG + find_library(SYCL_LIBRARY_DEBUG NAMES sycl7d sycl6d @@ -80,7 +80,7 @@ if(WIN32) ) endif() -FIND_PATH(SYCL_INCLUDE_DIR +find_path(SYCL_INCLUDE_DIR NAMES sycl/sycl.hpp HINTS @@ -89,36 +89,36 @@ FIND_PATH(SYCL_INCLUDE_DIR include ) -IF(EXISTS "${SYCL_INCLUDE_DIR}/sycl/version.hpp") - FILE(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_major_version REGEX "^#define __LIBSYCL_MAJOR_VERSION[ \t].*$") - STRING(REGEX MATCHALL "[0-9]+" _libsycl_major_version ${_libsycl_major_version}) - FILE(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_minor_version REGEX "^#define __LIBSYCL_MINOR_VERSION[ \t].*$") - STRING(REGEX MATCHALL "[0-9]+" _libsycl_minor_version ${_libsycl_minor_version}) - FILE(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_patch_version REGEX "^#define __LIBSYCL_PATCH_VERSION[ \t].*$") - STRING(REGEX MATCHALL "[0-9]+" _libsycl_patch_version ${_libsycl_patch_version}) +if(EXISTS "${SYCL_INCLUDE_DIR}/sycl/version.hpp") + file(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_major_version REGEX "^#define __LIBSYCL_MAJOR_VERSION[ \t].*$") + string(REGEX MATCHALL "[0-9]+" _libsycl_major_version ${_libsycl_major_version}) + file(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_minor_version REGEX "^#define __LIBSYCL_MINOR_VERSION[ \t].*$") + string(REGEX MATCHALL "[0-9]+" _libsycl_minor_version ${_libsycl_minor_version}) + file(STRINGS "${SYCL_INCLUDE_DIR}/sycl/version.hpp" _libsycl_patch_version REGEX "^#define __LIBSYCL_PATCH_VERSION[ \t].*$") + string(REGEX MATCHALL "[0-9]+" _libsycl_patch_version ${_libsycl_patch_version}) - SET(SYCL_VERSION "${_libsycl_major_version}.${_libsycl_minor_version}.${_libsycl_patch_version}") -ENDIF() + set(SYCL_VERSION "${_libsycl_major_version}.${_libsycl_minor_version}.${_libsycl_patch_version}") +endif() -INCLUDE(FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SYCL +find_package_handle_standard_args(SYCL REQUIRED_VARS SYCL_LIBRARY SYCL_INCLUDE_DIR VERSION_VAR SYCL_VERSION ) -IF(SYCL_FOUND) - SET(SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR} ${SYCL_INCLUDE_DIR}/sycl) - IF(WIN32 AND SYCL_LIBRARY_DEBUG) - SET(SYCL_LIBRARIES optimized ${SYCL_LIBRARY} debug ${SYCL_LIBRARY_DEBUG}) - ELSE() - SET(SYCL_LIBRARIES ${SYCL_LIBRARY}) - ENDIF() -ELSE() - SET(SYCL_SYCL_FOUND FALSE) -ENDIF() +if(SYCL_FOUND) + set(SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR} ${SYCL_INCLUDE_DIR}/sycl) + if(WIN32 AND SYCL_LIBRARY_DEBUG) + set(SYCL_LIBRARIES optimized ${SYCL_LIBRARY} debug ${SYCL_LIBRARY_DEBUG}) + else() + set(SYCL_LIBRARIES ${SYCL_LIBRARY}) + endif() +else() + set(SYCL_SYCL_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( SYCL_COMPILER SYCL_INCLUDE_DIR SYCL_LIBRARY diff --git a/build_files/cmake/Modules/FindShaderC.cmake b/build_files/cmake/Modules/FindShaderC.cmake index b1bcf62cbac..665b3a99b1e 100644 --- a/build_files/cmake/Modules/FindShaderC.cmake +++ b/build_files/cmake/Modules/FindShaderC.cmake @@ -14,25 +14,25 @@ # # If `SHADERC_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED SHADERC_ROOT_DIR) +if(DEFINED SHADERC_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{SHADERC_ROOT_DIR}) - SET(SHADERC_ROOT_DIR $ENV{SHADERC_ROOT_DIR}) -ELSE() - SET(SHADERC_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{SHADERC_ROOT_DIR}) + set(SHADERC_ROOT_DIR $ENV{SHADERC_ROOT_DIR}) +else() + set(SHADERC_ROOT_DIR "") +endif() -SET(_shaderc_SEARCH_DIRS +set(_shaderc_SEARCH_DIRS ${SHADERC_ROOT_DIR} ) # FIXME: These finder modules typically don't use LIBDIR, # this should be set by `./build_files/cmake/platform/` instead. -IF(DEFINED LIBDIR) - SET(_shaderc_SEARCH_DIRS ${_shaderc_SEARCH_DIRS} ${LIBDIR}/shaderc) -ENDIF() +if(DEFINED LIBDIR) + set(_shaderc_SEARCH_DIRS ${_shaderc_SEARCH_DIRS} ${LIBDIR}/shaderc) +endif() -FIND_PATH(SHADERC_INCLUDE_DIR +find_path(SHADERC_INCLUDE_DIR NAMES shaderc/shaderc.h HINTS @@ -41,7 +41,7 @@ FIND_PATH(SHADERC_INCLUDE_DIR include ) -FIND_LIBRARY(SHADERC_LIBRARY +find_library(SHADERC_LIBRARY NAMES shaderc_combined HINTS @@ -52,17 +52,17 @@ FIND_LIBRARY(SHADERC_LIBRARY # handle the QUIETLY and REQUIRED arguments and set SHADERC_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ShaderC DEFAULT_MSG SHADERC_LIBRARY SHADERC_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(ShaderC DEFAULT_MSG SHADERC_LIBRARY SHADERC_INCLUDE_DIR) -IF(SHADERC_FOUND) - SET(SHADERC_LIBRARIES ${SHADERC_LIBRARY}) - SET(SHADERC_INCLUDE_DIRS ${SHADERC_INCLUDE_DIR}) -ENDIF() +if(SHADERC_FOUND) + set(SHADERC_LIBRARIES ${SHADERC_LIBRARY}) + set(SHADERC_INCLUDE_DIRS ${SHADERC_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( SHADERC_INCLUDE_DIR SHADERC_LIBRARY ) -UNSET(_shaderc_SEARCH_DIRS) +unset(_shaderc_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index 47003702b72..584ee27ff6a 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -16,26 +16,26 @@ # LIBSNDFILE_LIBRARY, where to find the SndFile library. # If `LIBSNDFILE_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED LIBSNDFILE_ROOT_DIR) +if(DEFINED LIBSNDFILE_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{LIBSNDFILE_ROOT_DIR}) - SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR}) -ELSE() - SET(LIBSNDFILE_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{LIBSNDFILE_ROOT_DIR}) + set(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR}) +else() + set(LIBSNDFILE_ROOT_DIR "") +endif() -SET(_sndfile_SEARCH_DIRS +set(_sndfile_SEARCH_DIRS ${LIBSNDFILE_ROOT_DIR} ) -FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h +find_path(LIBSNDFILE_INCLUDE_DIR sndfile.h HINTS ${_sndfile_SEARCH_DIRS} PATH_SUFFIXES include ) -FIND_LIBRARY(LIBSNDFILE_LIBRARY +find_library(LIBSNDFILE_LIBRARY NAMES sndfile HINTS @@ -46,16 +46,16 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY # handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SndFile DEFAULT_MSG LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR) -IF(SNDFILE_FOUND) - SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) - SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) -ENDIF() +if(SNDFILE_FOUND) + set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) + set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( LIBSNDFILE_INCLUDE_DIR LIBSNDFILE_LIBRARY ) diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index 77ef0e962ba..08d780e44d0 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -16,19 +16,19 @@ # SPACENAV_LIBRARY, where to find the Spacenav library. # If `SPACENAV_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED SPACENAV_ROOT_DIR) +if(DEFINED SPACENAV_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{SPACENAV_ROOT_DIR}) - SET(SPACENAV_ROOT_DIR $ENV{SPACENAV_ROOT_DIR}) -ELSE() - SET(SPACENAV_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{SPACENAV_ROOT_DIR}) + set(SPACENAV_ROOT_DIR $ENV{SPACENAV_ROOT_DIR}) +else() + set(SPACENAV_ROOT_DIR "") +endif() -SET(_spacenav_SEARCH_DIRS +set(_spacenav_SEARCH_DIRS ${SPACENAV_ROOT_DIR} ) -FIND_PATH(SPACENAV_INCLUDE_DIR +find_path(SPACENAV_INCLUDE_DIR NAMES spnav.h HINTS @@ -37,7 +37,7 @@ FIND_PATH(SPACENAV_INCLUDE_DIR include ) -FIND_LIBRARY(SPACENAV_LIBRARY +find_library(SPACENAV_LIBRARY NAMES spnav HINTS @@ -48,16 +48,16 @@ FIND_LIBRARY(SPACENAV_LIBRARY # handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spacenav DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Spacenav DEFAULT_MSG SPACENAV_LIBRARY SPACENAV_INCLUDE_DIR) -IF(SPACENAV_FOUND) - SET(SPACENAV_LIBRARIES ${SPACENAV_LIBRARY}) - SET(SPACENAV_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIR}) -ENDIF() +if(SPACENAV_FOUND) + set(SPACENAV_LIBRARIES ${SPACENAV_LIBRARY}) + set(SPACENAV_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( SPACENAV_INCLUDE_DIR SPACENAV_LIBRARY ) diff --git a/build_files/cmake/Modules/FindTBB.cmake b/build_files/cmake/Modules/FindTBB.cmake index ecb2f977a97..117b27813c9 100644 --- a/build_files/cmake/Modules/FindTBB.cmake +++ b/build_files/cmake/Modules/FindTBB.cmake @@ -16,20 +16,20 @@ # TBB_LIBRARY, where to find the TBB library. # If `TBB_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED TBB_ROOT_DIR) +if(DEFINED TBB_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{TBB_ROOT_DIR}) - SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR}) -ELSE() - SET(TBB_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{TBB_ROOT_DIR}) + set(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR}) +else() + set(TBB_ROOT_DIR "") +endif() -SET(_tbb_SEARCH_DIRS +set(_tbb_SEARCH_DIRS ${TBB_ROOT_DIR} /opt/lib/tbb ) -FIND_PATH(TBB_INCLUDE_DIR +find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS @@ -38,7 +38,7 @@ FIND_PATH(TBB_INCLUDE_DIR include ) -FIND_LIBRARY(TBB_LIBRARY +find_library(TBB_LIBRARY NAMES tbb HINTS @@ -49,18 +49,18 @@ FIND_LIBRARY(TBB_LIBRARY # handle the QUIETLY and REQUIRED arguments and set TBB_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR) -IF(TBB_FOUND) - SET(TBB_LIBRARIES ${TBB_LIBRARY}) - SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR}) -ELSE() - SET(TBB_TBB_FOUND FALSE) -ENDIF() +if(TBB_FOUND) + set(TBB_LIBRARIES ${TBB_LIBRARY}) + set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR}) +else() + set(TBB_TBB_FOUND FALSE) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( TBB_INCLUDE_DIR TBB_LIBRARY ) diff --git a/build_files/cmake/Modules/FindUSD.cmake b/build_files/cmake/Modules/FindUSD.cmake index 1752523a3b9..f3b7d88a073 100644 --- a/build_files/cmake/Modules/FindUSD.cmake +++ b/build_files/cmake/Modules/FindUSD.cmake @@ -14,20 +14,20 @@ # # If `USD_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED USD_ROOT_DIR) +if(DEFINED USD_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{USD_ROOT_DIR}) - SET(USD_ROOT_DIR $ENV{USD_ROOT_DIR}) -ELSE() - SET(USD_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{USD_ROOT_DIR}) + set(USD_ROOT_DIR $ENV{USD_ROOT_DIR}) +else() + set(USD_ROOT_DIR "") +endif() -SET(_usd_SEARCH_DIRS +set(_usd_SEARCH_DIRS ${USD_ROOT_DIR} /opt/lib/usd ) -FIND_PATH(USD_INCLUDE_DIR +find_path(USD_INCLUDE_DIR NAMES pxr/usd/usd/api.h HINTS @@ -37,14 +37,14 @@ FIND_PATH(USD_INCLUDE_DIR DOC "Universal Scene Description (USD) header files" ) -IF(NOT DEFINED PXR_LIB_PREFIX) - SET(PXR_LIB_PREFIX "") -ENDIF() +if(NOT DEFINED PXR_LIB_PREFIX) + set(PXR_LIB_PREFIX "") +endif() # Since USD 21.11 the libraries are prefixed with "usd_", i.e. # "libusd_m.a" became "libusd_usd_m.a". # See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01 -FIND_LIBRARY(USD_LIBRARY +find_library(USD_LIBRARY NAMES usd_usd_m usd_usd_ms usd_m usd_ms ${PXR_LIB_PREFIX}usd @@ -56,28 +56,28 @@ FIND_LIBRARY(USD_LIBRARY DOC "Universal Scene Description (USD) monolithic library" ) -IF(NOT USD_LIBRARY) +if(NOT USD_LIBRARY) set(USD_FOUND FALSE) -ELSE() +else() # handle the QUIETLY and REQUIRED arguments and set USD_FOUND to TRUE if # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(USD DEFAULT_MSG USD_LIBRARY USD_INCLUDE_DIR) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(USD DEFAULT_MSG USD_LIBRARY USD_INCLUDE_DIR) - IF(USD_FOUND) + if(USD_FOUND) get_filename_component(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY) - SET(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR}) + set(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR}) set(USD_LIBRARIES ${USD_LIBRARY}) - IF(EXISTS ${USD_INCLUDE_DIR}/pxr/base/tf/pyModule.h) - SET(USD_PYTHON_SUPPORT ON) - ENDIF() - ENDIF() -ENDIF() + if(EXISTS ${USD_INCLUDE_DIR}/pxr/base/tf/pyModule.h) + set(USD_PYTHON_SUPPORT ON) + endif() + endif() +endif() -MARK_AS_ADVANCED( +mark_as_advanced( USD_INCLUDE_DIR USD_LIBRARY_DIR USD_LIBRARY ) -UNSET(_usd_SEARCH_DIRS) +unset(_usd_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindVulkan.cmake b/build_files/cmake/Modules/FindVulkan.cmake index d5ba6f91989..84c73a0d57c 100644 --- a/build_files/cmake/Modules/FindVulkan.cmake +++ b/build_files/cmake/Modules/FindVulkan.cmake @@ -14,25 +14,25 @@ # # If `VULKAN_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED VULKAN_ROOT_DIR) +if(DEFINED VULKAN_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{VULKAN_ROOT_DIR}) - SET(VULKAN_ROOT_DIR $ENV{VULKAN_ROOT_DIR}) -ELSE() - SET(VULKAN_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{VULKAN_ROOT_DIR}) + set(VULKAN_ROOT_DIR $ENV{VULKAN_ROOT_DIR}) +else() + set(VULKAN_ROOT_DIR "") +endif() -SET(_vulkan_SEARCH_DIRS +set(_vulkan_SEARCH_DIRS ${VULKAN_ROOT_DIR} ) # FIXME: These finder modules typically don't use LIBDIR, # this should be set by `./build_files/cmake/platform/` instead. -IF(DEFINED LIBDIR) - SET(_vulkan_SEARCH_DIRS ${_vulkan_SEARCH_DIRS} ${LIBDIR}/vulkan) -ENDIF() +if(DEFINED LIBDIR) + set(_vulkan_SEARCH_DIRS ${_vulkan_SEARCH_DIRS} ${LIBDIR}/vulkan) +endif() -FIND_PATH(VULKAN_INCLUDE_DIR +find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS @@ -41,7 +41,7 @@ FIND_PATH(VULKAN_INCLUDE_DIR include ) -FIND_LIBRARY(VULKAN_LIBRARY +find_library(VULKAN_LIBRARY NAMES vulkan HINTS @@ -52,17 +52,17 @@ FIND_LIBRARY(VULKAN_LIBRARY # handle the QUIETLY and REQUIRED arguments and set VULKAN_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Vulkan DEFAULT_MSG VULKAN_LIBRARY VULKAN_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Vulkan DEFAULT_MSG VULKAN_LIBRARY VULKAN_INCLUDE_DIR) -IF(VULKAN_FOUND) - SET(VULKAN_LIBRARIES ${VULKAN_LIBRARY}) - SET(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR}) -ENDIF() +if(VULKAN_FOUND) + set(VULKAN_LIBRARIES ${VULKAN_LIBRARY}) + set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( VULKAN_INCLUDE_DIR VULKAN_LIBRARY ) -UNSET(_vulkan_SEARCH_DIRS) +unset(_vulkan_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindWebP.cmake b/build_files/cmake/Modules/FindWebP.cmake index 7a769d65319..f238c9f12be 100644 --- a/build_files/cmake/Modules/FindWebP.cmake +++ b/build_files/cmake/Modules/FindWebP.cmake @@ -15,20 +15,20 @@ # WEBP_LIBRARY, where to find the WEBP library. # If `WEBP_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED WEBP_ROOT_DIR) +if(DEFINED WEBP_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{WEBP_ROOT_DIR}) - SET(WEBP_ROOT_DIR $ENV{WEBP_ROOT_DIR}) -ELSE() - SET(WEBP_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{WEBP_ROOT_DIR}) + set(WEBP_ROOT_DIR $ENV{WEBP_ROOT_DIR}) +else() + set(WEBP_ROOT_DIR "") +endif() -SET(_webp_SEARCH_DIRS +set(_webp_SEARCH_DIRS ${WEBP_ROOT_DIR} /opt/lib/webp ) -FIND_PATH(WEBP_INCLUDE_DIR +find_path(WEBP_INCLUDE_DIR NAMES webp/types.h HINTS @@ -37,17 +37,17 @@ FIND_PATH(WEBP_INCLUDE_DIR include ) -SET(_webp_FIND_COMPONENTS +set(_webp_FIND_COMPONENTS webp webpmux webpdemux ) -SET(_webp_LIBRARIES) -FOREACH(COMPONENT ${_webp_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) +set(_webp_LIBRARIES) +foreach(COMPONENT ${_webp_FIND_COMPONENTS}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - FIND_LIBRARY(WEBP_${UPPERCOMPONENT}_LIBRARY + find_library(WEBP_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT} NAMES_PER_DIR @@ -56,27 +56,27 @@ FOREACH(COMPONENT ${_webp_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib lib/static ) - LIST(APPEND _webp_LIBRARIES "${WEBP_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() + list(APPEND _webp_LIBRARIES "${WEBP_${UPPERCOMPONENT}_LIBRARY}") +endforeach() -IF(NOT WEBP_WEBP_LIBRARY) +if(NOT WEBP_WEBP_LIBRARY) set(WEBP_FOUND FALSE) -ELSE() +else() # handle the QUIETLY and REQUIRED arguments and set WEBP_FOUND to TRUE if # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(WebP DEFAULT_MSG _webp_LIBRARIES WEBP_INCLUDE_DIR) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(WebP DEFAULT_MSG _webp_LIBRARIES WEBP_INCLUDE_DIR) - IF(WEBP_FOUND) + if(WEBP_FOUND) get_filename_component(WEBP_LIBRARY_DIR ${WEBP_WEBP_LIBRARY} DIRECTORY) - SET(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) - SET(WEBP_LIBRARIES ${_webp_LIBRARIES}) - ELSE() - SET(WEBPL_PUGIXML_FOUND FALSE) - ENDIF() -ENDIF() + set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) + set(WEBP_LIBRARIES ${_webp_LIBRARIES}) + else() + set(WEBPL_PUGIXML_FOUND FALSE) + endif() +endif() -MARK_AS_ADVANCED( +mark_as_advanced( WEBP_INCLUDE_DIR WEBP_LIBRARY_DIR diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index 6f30dc9aebb..aa50e707e03 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -16,26 +16,26 @@ # XML2_LIBRARY, where to find the XML2 library. # If `XML2_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED XML2_ROOT_DIR) +if(DEFINED XML2_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{XML2_ROOT_DIR}) - SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR}) -ELSE() - SET(XML2_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{XML2_ROOT_DIR}) + set(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR}) +else() + set(XML2_ROOT_DIR "") +endif() -SET(_xml2_SEARCH_DIRS +set(_xml2_SEARCH_DIRS ${XML2_ROOT_DIR} ) -FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h +find_path(XML2_INCLUDE_DIR libxml2/libxml/xpath.h HINTS ${_xml2_SEARCH_DIRS} PATH_SUFFIXES include ) -FIND_LIBRARY(XML2_LIBRARY +find_library(XML2_LIBRARY NAMES xml2 HINTS @@ -46,16 +46,16 @@ FIND_LIBRARY(XML2_LIBRARY # handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(XML2 DEFAULT_MSG XML2_LIBRARY XML2_INCLUDE_DIR) -IF(XML2_FOUND) - SET(XML2_LIBRARIES ${XML2_LIBRARY}) - SET(XML2_INCLUDE_DIRS ${XML2_INCLUDE_DIR}) -ENDIF() +if(XML2_FOUND) + set(XML2_LIBRARIES ${XML2_LIBRARY}) + set(XML2_INCLUDE_DIRS ${XML2_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( XML2_INCLUDE_DIR XML2_LIBRARY ) diff --git a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake index 234bb93e202..aa55c42c0c0 100644 --- a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake +++ b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake @@ -24,20 +24,20 @@ # XR_OPENXR_SDK_LOADER_LIBRARY, where to find the OpenXR-SDK loader library. # If `XR_OPENXR_SDK_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED XR_OPENXR_SDK_ROOT_DIR) +if(DEFINED XR_OPENXR_SDK_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{XR_OPENXR_SDK_ROOT_DIR}) - SET(XR_OPENXR_SDK_ROOT_DIR $ENV{XR_OPENXR_SDK_ROOT_DIR}) -ELSE() - SET(XR_OPENXR_SDK_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{XR_OPENXR_SDK_ROOT_DIR}) + set(XR_OPENXR_SDK_ROOT_DIR $ENV{XR_OPENXR_SDK_ROOT_DIR}) +else() + set(XR_OPENXR_SDK_ROOT_DIR "") +endif() -SET(_xr_openxr_sdk_SEARCH_DIRS +set(_xr_openxr_sdk_SEARCH_DIRS ${XR_OPENXR_SDK_ROOT_DIR} /opt/lib/xr-openxr-sdk ) -FIND_PATH(XR_OPENXR_SDK_INCLUDE_DIR +find_path(XR_OPENXR_SDK_INCLUDE_DIR NAMES openxr/openxr.h HINTS @@ -46,7 +46,7 @@ FIND_PATH(XR_OPENXR_SDK_INCLUDE_DIR include ) -FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY +find_library(XR_OPENXR_SDK_LOADER_LIBRARY NAMES openxr_loader HINTS @@ -57,16 +57,16 @@ FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY # handle the QUIETLY and REQUIRED arguments and set XR_OPENXR_SDK_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OpenXR_SDK DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(XR_OpenXR_SDK DEFAULT_MSG XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR) -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() +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() -MARK_AS_ADVANCED( +mark_as_advanced( XR_OPENXR_SDK_INCLUDE_DIR XR_OPENXR_SDK_LOADER_LIBRARY ) diff --git a/build_files/cmake/Modules/FindZstd.cmake b/build_files/cmake/Modules/FindZstd.cmake index 03fead62bac..8588d2ce8d4 100644 --- a/build_files/cmake/Modules/FindZstd.cmake +++ b/build_files/cmake/Modules/FindZstd.cmake @@ -16,19 +16,19 @@ # ZSTD_LIBRARY, where to find the Zstd library. # If `ZSTD_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED ZSTD_ROOT_DIR) +if(DEFINED ZSTD_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{ZSTD_ROOT_DIR}) - SET(ZSTD_ROOT_DIR $ENV{ZSTD_ROOT_DIR}) -ELSE() - SET(ZSTD_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{ZSTD_ROOT_DIR}) + set(ZSTD_ROOT_DIR $ENV{ZSTD_ROOT_DIR}) +else() + set(ZSTD_ROOT_DIR "") +endif() -SET(_zstd_SEARCH_DIRS +set(_zstd_SEARCH_DIRS ${ZSTD_ROOT_DIR} ) -FIND_PATH(ZSTD_INCLUDE_DIR +find_path(ZSTD_INCLUDE_DIR NAMES zstd.h HINTS @@ -37,7 +37,7 @@ FIND_PATH(ZSTD_INCLUDE_DIR include ) -FIND_LIBRARY(ZSTD_LIBRARY +find_library(ZSTD_LIBRARY NAMES zstd HINTS @@ -48,16 +48,16 @@ FIND_LIBRARY(ZSTD_LIBRARY # handle the QUIETLY and REQUIRED arguments and set ZSTD_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Zstd DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Zstd DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) -IF(ZSTD_FOUND) - SET(ZSTD_LIBRARIES ${ZSTD_LIBRARY}) - SET(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR}) -ENDIF() +if(ZSTD_FOUND) + set(ZSTD_LIBRARIES ${ZSTD_LIBRARY}) + set(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( ZSTD_INCLUDE_DIR ZSTD_LIBRARY ) diff --git a/build_files/cmake/Modules/Findsse2neon.cmake b/build_files/cmake/Modules/Findsse2neon.cmake index bff265bca15..80ad9725066 100644 --- a/build_files/cmake/Modules/Findsse2neon.cmake +++ b/build_files/cmake/Modules/Findsse2neon.cmake @@ -12,19 +12,19 @@ # SSE2NEON_FOUND, If false, do not try to use sse2neon. # If `SSE2NEON_ROOT_DIR` was defined in the environment, use it. -IF(DEFINED SSE2NEON_ROOT_DIR) +if(DEFINED SSE2NEON_ROOT_DIR) # Pass. -ELSEIF(DEFINED ENV{SSE2NEON_ROOT_DIR}) - SET(SSE2NEON_ROOT_DIR $ENV{SSE2NEON_ROOT_DIR}) -ELSE() - SET(SSE2NEON_ROOT_DIR "") -ENDIF() +elseif(DEFINED ENV{SSE2NEON_ROOT_DIR}) + set(SSE2NEON_ROOT_DIR $ENV{SSE2NEON_ROOT_DIR}) +else() + set(SSE2NEON_ROOT_DIR "") +endif() -SET(_sse2neon_SEARCH_DIRS +set(_sse2neon_SEARCH_DIRS ${SSE2NEON_ROOT_DIR} ) -FIND_PATH(SSE2NEON_INCLUDE_DIR +find_path(SSE2NEON_INCLUDE_DIR NAMES sse2neon.h HINTS @@ -35,16 +35,16 @@ FIND_PATH(SSE2NEON_INCLUDE_DIR # handle the QUIETLY and REQUIRED arguments and set SSE2NEON_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(sse2neon DEFAULT_MSG +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(sse2neon DEFAULT_MSG SSE2NEON_INCLUDE_DIR) -IF(SSE2NEON_FOUND) - SET(SSE2NEON_INCLUDE_DIRS ${SSE2NEON_INCLUDE_DIR}) -ENDIF() +if(SSE2NEON_FOUND) + set(SSE2NEON_INCLUDE_DIRS ${SSE2NEON_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED( +mark_as_advanced( SSE2NEON_INCLUDE_DIR ) -UNSET(_sse2neon_SEARCH_DIRS) +unset(_sse2neon_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index bc5bbc5cc91..7a6107d6d9c 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -85,7 +85,7 @@ macro(BLENDER_SRC_GTEST_EX) target_link_libraries(${TARGET_NAME} PRIVATE ${GMP_LIBRARIES}) endif() - GET_BLENDER_TEST_INSTALL_DIR(TEST_INSTALL_DIR) + get_blender_test_install_dir(TEST_INSTALL_DIR) set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTS_OUTPUT_DIR}" RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}" diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 151fd75796e..3d2db6ae674 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -906,7 +906,7 @@ macro(remove_cc_flag_unsigned_char) endif() endmacro() -function(ADD_CHECK_C_COMPILER_FLAG_IMPL +function(add_check_c_compiler_flag_impl _CFLAGS _CACHE_VAR _FLAG @@ -923,7 +923,7 @@ function(ADD_CHECK_C_COMPILER_FLAG_IMPL endif() endfunction() -function(ADD_CHECK_CXX_COMPILER_FLAG_IMPL +function(add_check_cxx_compiler_flag_impl _CXXFLAGS _CACHE_VAR _FLAG @@ -945,7 +945,7 @@ function(ADD_CHECK_C_COMPILER_FLAGS _CFLAGS) set(cache_var "") foreach(arg ${ARGN}) if(cache_var) - ADD_CHECK_C_COMPILER_FLAG_IMPL("${_CFLAGS}" "${cache_var}" "${arg}") + add_check_c_compiler_flag_impl("${_CFLAGS}" "${cache_var}" "${arg}") set(cache_var "") else() set(cache_var "${arg}") @@ -959,7 +959,7 @@ function(ADD_CHECK_CXX_COMPILER_FLAGS _CXXFLAGS) set(cache_var "") foreach(arg ${ARGN}) if(cache_var) - ADD_CHECK_CXX_COMPILER_FLAG_IMPL("${_CXXFLAGS}" "${cache_var}" "${arg}") + add_check_cxx_compiler_flag_impl("${_CXXFLAGS}" "${cache_var}" "${arg}") set(cache_var "") else() set(cache_var "${arg}") diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index c43f67a67da..898d780c614 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -742,7 +742,7 @@ endif() # OptiX PTX modules if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES) - macro(CYCLES_OPTIX_KERNEL_ADD name input flags) + macro(cycles_optix_kernel_add name input flags) set(output "${CMAKE_CURRENT_BINARY_DIR}/${name}.ptx") set(cuda_flags ${flags} @@ -800,11 +800,11 @@ if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES) "device/optix/kernel_shader_raytrace.cu" "--keep-device-functions") if(WITH_CYCLES_OSL AND OSL_LIBRARY_VERSION_CODE GREATER_EQUAL 11300) - CYCLES_OPTIX_KERNEL_ADD( + cycles_optix_kernel_add( kernel_optix_osl "device/optix/kernel_osl.cu" "--relocatable-device-code=true") - CYCLES_OPTIX_KERNEL_ADD( + cycles_optix_kernel_add( kernel_optix_osl_services "osl/services_optix.cu" "--relocatable-device-code=true") diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 68bf7923ce3..4168a73f274 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -632,7 +632,7 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS) -blacklist ${_cycles_blacklist} ) - if(NOT("${_cycles_device_lower}" STREQUAL "cpu")) + if(NOT ("${_cycles_device_lower}" STREQUAL "cpu")) set_tests_properties(${_cycles_test_name} PROPERTIES RUN_SERIAL TRUE) endif() unset(_cycles_test_name) @@ -870,7 +870,7 @@ endif() if(NOT OPENIMAGEIO_IDIFF) message(STATUS "Disabling ImBuf image format tests because OIIO idiff does not exist") else() - SET(OPTIONAL_FORMATS "") + set(OPTIONAL_FORMATS "") if(WITH_IMAGE_CINEON) set(OPTIONAL_FORMATS "${OPTIONAL_FORMATS} CINEON") endif()