diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-06-20 14:13:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-20 16:59:07 +0300 |
commit | 859b3ff34675d51b2e8548217f8d011c2846ee70 (patch) | |
tree | b8a15cd79c58ee7fc6312515ba0b5cf4cdff7f50 /build_files | |
parent | bce482f476fad526d34c889de200eb58e8c0c861 (diff) |
Cleanup: remove contents of endif() in cmake
This convention is no longer used for Blender's CMake files.
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/Modules/FindGflags.cmake | 12 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindNanoVDB.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/Findsse2neon.cmake | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/build_files/cmake/Modules/FindGflags.cmake b/build_files/cmake/Modules/FindGflags.cmake index 71a05b423ed..e6da056925f 100644 --- a/build_files/cmake/Modules/FindGflags.cmake +++ b/build_files/cmake/Modules/FindGflags.cmake @@ -472,8 +472,7 @@ if(NOT GFLAGS_FOUND) gflags_report_not_found( "Could not find gflags include directory, set GFLAGS_INCLUDE_DIR " "to directory containing gflags/gflags.h") - endif(NOT GFLAGS_INCLUDE_DIR OR - NOT EXISTS ${GFLAGS_INCLUDE_DIR}) + endif() find_library(GFLAGS_LIBRARY NAMES gflags PATHS ${GFLAGS_LIBRARY_DIR_HINTS} @@ -484,8 +483,7 @@ if(NOT GFLAGS_FOUND) gflags_report_not_found( "Could not find gflags library, set GFLAGS_LIBRARY " "to full path to libgflags.") - endif(NOT GFLAGS_LIBRARY OR - NOT EXISTS ${GFLAGS_LIBRARY}) + endif() # gflags typically requires a threading library (which is OS dependent), note # that this defines the CMAKE_THREAD_LIBS_INIT variable. If we are able to @@ -560,8 +558,7 @@ if(NOT GFLAGS_FOUND) gflags_report_not_found( "Caller defined GFLAGS_INCLUDE_DIR:" " ${GFLAGS_INCLUDE_DIR} does not contain gflags/gflags.h header.") - endif(GFLAGS_INCLUDE_DIR AND - NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) + endif() # TODO: This regex for gflags library is pretty primitive, we use lowercase # for comparison to handle Windows using CamelCase library names, could # this check be better? @@ -571,8 +568,7 @@ if(NOT GFLAGS_FOUND) gflags_report_not_found( "Caller defined GFLAGS_LIBRARY: " "${GFLAGS_LIBRARY} does not match gflags.") - endif(GFLAGS_LIBRARY AND - NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*") + endif() gflags_reset_find_library_prefix() diff --git a/build_files/cmake/Modules/FindNanoVDB.cmake b/build_files/cmake/Modules/FindNanoVDB.cmake index 95d76fb39af..e830f770c03 100644 --- a/build_files/cmake/Modules/FindNanoVDB.cmake +++ b/build_files/cmake/Modules/FindNanoVDB.cmake @@ -40,7 +40,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(NanoVDB DEFAULT_MSG IF(NANOVDB_FOUND) SET(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR}) -ENDIF(NANOVDB_FOUND) +ENDIF() MARK_AS_ADVANCED( NANOVDB_INCLUDE_DIR diff --git a/build_files/cmake/Modules/Findsse2neon.cmake b/build_files/cmake/Modules/Findsse2neon.cmake index 2159dfac114..5c163326251 100644 --- a/build_files/cmake/Modules/Findsse2neon.cmake +++ b/build_files/cmake/Modules/Findsse2neon.cmake @@ -40,7 +40,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(sse2neon DEFAULT_MSG IF(SSE2NEON_FOUND) SET(SSE2NEON_INCLUDE_DIRS ${SSE2NEON_INCLUDE_DIR}) -ENDIF(SSE2NEON_FOUND) +ENDIF() MARK_AS_ADVANCED( SSE2NEON_INCLUDE_DIR |