[Bf-blender-cvs] [3e101759b1b] master: Cleanup: remove arguments to ENDIF in CMake files

Campbell Barton noreply at git.blender.org
Mon Oct 5 07:41:14 CEST 2020 

Commit: 3e101759b1b726e3cc16c69b2619cd1d82b00a8e
Author: Campbell Barton
Date:   Mon Oct 5 16:02:32 2020 +1100
Branches: master
https://developer.blender.org/rB3e101759b1b726e3cc16c69b2619cd1d82b00a8e

Cleanup: remove arguments to ENDIF in CMake files

This is an old convention that hasn't been used
by Blender or CMake distributed Find* files for a long time.

===================================================================

M	build_files/build_environment/cmake/jpeg.cmake
M	build_files/cmake/Modules/FindAlembic.cmake
M	build_files/cmake/Modules/FindAudaspace.cmake
M	build_files/cmake/Modules/FindEigen3.cmake
M	build_files/cmake/Modules/FindEmbree.cmake
M	build_files/cmake/Modules/FindFFmpeg.cmake
M	build_files/cmake/Modules/FindFftw3.cmake
M	build_files/cmake/Modules/FindGLEW.cmake
M	build_files/cmake/Modules/FindGMP.cmake
M	build_files/cmake/Modules/FindIcuLinux.cmake
M	build_files/cmake/Modules/FindJack.cmake
M	build_files/cmake/Modules/FindJeMalloc.cmake
M	build_files/cmake/Modules/FindLZO.cmake
M	build_files/cmake/Modules/FindOSL.cmake
M	build_files/cmake/Modules/FindOpenCOLLADA.cmake
M	build_files/cmake/Modules/FindOpenColorIO.cmake
M	build_files/cmake/Modules/FindOpenJPEG.cmake
M	build_files/cmake/Modules/FindOpenSubdiv.cmake
M	build_files/cmake/Modules/FindOpenVDB.cmake
M	build_files/cmake/Modules/FindOptiX.cmake
M	build_files/cmake/Modules/FindPCRE.cmake
M	build_files/cmake/Modules/FindSDL2.cmake
M	build_files/cmake/Modules/FindSndFile.cmake
M	build_files/cmake/Modules/FindSpacenav.cmake
M	build_files/cmake/Modules/FindUSD.cmake
M	build_files/cmake/Modules/FindXML2.cmake
M	build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake
index e0200d84897..7b03a1b4f3c 100644
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -59,4 +59,4 @@ else(WIN32)
   )
 
   set(JPEG_LIBRARY libjpeg${LIBEXT})
-endif(WIN32)
+endif()
diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake
index aba91bb565d..18214b25c8f 100644
--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_IN
 IF(ALEMBIC_FOUND)
   SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
   SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
-ENDIF(ALEMBIC_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   ALEMBIC_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake
index 9bf15e05272..07ce2ba33d0 100644
--- a/build_files/cmake/Modules/FindAudaspace.cmake
+++ b/build_files/cmake/Modules/FindAudaspace.cmake
@@ -30,7 +30,7 @@ SET(_audaspace_SEARCH_DIRS
 FIND_PACKAGE(PkgConfig)
 IF(PKG_CONFIG_FOUND)
   PKG_CHECK_MODULES(AUDASPACE_PKGCONF audaspace)
-ENDIF(PKG_CONFIG_FOUND)
+ENDIF()
 
 # Include dir
 FIND_PATH(AUDASPACE_INCLUDE_DIR
@@ -88,17 +88,17 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_Py  DEFAULT_MSG  AUDASPACE_PY_LIBRAR
 IF(AUDASPACE_FOUND)
   SET(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
   SET(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
-ENDIF(AUDASPACE_FOUND)
+ENDIF()
 
 IF(AUDASPACE_C_FOUND)
   SET(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY})
   SET(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR})
-ENDIF(AUDASPACE_C_FOUND)
+ENDIF()
 
 IF(AUDASPACE_PY_FOUND)
   SET(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY})
   SET(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR})
-ENDIF(AUDASPACE_PY_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   AUDASPACE_LIBRARY
diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake
index 735f44a04db..8b4399fdd07 100644
--- a/build_files/cmake/Modules/FindEigen3.cmake
+++ b/build_files/cmake/Modules/FindEigen3.cmake
@@ -41,7 +41,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG
 
 IF(EIGEN3_FOUND)
   SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
-ENDIF(EIGEN3_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   EIGEN3_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake
index bc82d5c333a..0716f47ca52 100644
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@@ -80,7 +80,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG
 IF(EMBREE_FOUND)
   SET(EMBREE_LIBRARIES ${_embree_LIBRARIES})
   SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
-ENDIF(EMBREE_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   EMBREE_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake
index 9bd26e27fc6..0765c1dc901 100644
--- a/build_files/cmake/Modules/FindFFmpeg.cmake
+++ b/build_files/cmake/Modules/FindFFmpeg.cmake
@@ -72,7 +72,7 @@ find_package_handle_standard_args(FFmpeg DEFAULT_MSG
 IF(FFMPEG_FOUND)
   set(FFMPEG_LIBRARIES ${_ffmpeg_LIBRARIES})
   set(FFMPEG_INCLUDE_DIRS ${_ffmpeg_INCLUDE_DIR})
-ENDIF(FFMPEG_FOUND)
+ENDIF()
 
 mark_as_advanced(
   FFMPEG_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake
index df69c0c2ed4..bce22d21e8c 100644
--- a/build_files/cmake/Modules/FindFftw3.cmake
+++ b/build_files/cmake/Modules/FindFftw3.cmake
@@ -54,7 +54,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG
 IF(FFTW3_FOUND)
   SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
   SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
-ENDIF(FFTW3_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   FFTW3_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake
index 059b1da005d..759065d751c 100644
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG
 
 IF(GLEW_FOUND)
   SET(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
-ENDIF(GLEW_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   GLEW_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindGMP.cmake b/build_files/cmake/Modules/FindGMP.cmake
index a06b8737648..03ada24403b 100644
--- a/build_files/cmake/Modules/FindGMP.cmake
+++ b/build_files/cmake/Modules/FindGMP.cmake
@@ -82,7 +82,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG
 IF(GMP_FOUND)
   SET(GMP_LIBRARIES ${GMPXX_LIBRARY} ${GMP_LIBRARY})
   SET(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR} ${GMPXX_INCLUDE_DIR})
-ENDIF(GMP_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   GMP_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake
index e1aaa434533..46e76fface2 100644
--- a/build_files/cmake/Modules/FindIcuLinux.cmake
+++ b/build_files/cmake/Modules/FindIcuLinux.cmake
@@ -124,7 +124,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG
 IF(ICU_FOUND)
   SET(ICU_LIBRARIES ${ICU_LIBRARY_DATA} ${ICU_LIBRARY_I18N} ${ICU_LIBRARY_IO} ${ICU_LIBRARY_LE} ${ICU_LIBRARY_LX} ${ICU_LIBRARY_TU} ${ICU_LIBRARY_UC})
   SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
-ENDIF(ICU_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   ICU_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake
index a790c127c09..82ce890730d 100644
--- a/build_files/cmake/Modules/FindJack.cmake
+++ b/build_files/cmake/Modules/FindJack.cmake
@@ -54,7 +54,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG
 IF(JACK_FOUND)
   SET(JACK_LIBRARIES ${JACK_LIBRARY})
   SET(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR})
-ENDIF(JACK_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   JACK_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake
index 72a0bed6f22..7473c023cc7 100644
--- a/build_files/cmake/Modules/FindJeMalloc.cmake
+++ b/build_files/cmake/Modules/FindJeMalloc.cmake
@@ -64,7 +64,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG
 IF(JEMALLOC_FOUND)
   SET(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
   SET(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
-ENDIF(JEMALLOC_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   JEMALLOC_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake
index 81f8792a803..8a2cce5e181 100644
--- a/build_files/cmake/Modules/FindLZO.cmake
+++ b/build_files/cmake/Modules/FindLZO.cmake
@@ -52,7 +52,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG
 IF(LZO_FOUND)
   SET(LZO_LIBRARIES ${LZO_LIBRARY})
   SET(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR})
-ENDIF(LZO_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   LZO_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindOSL.cmake b/build_files/cmake/Modules/FindOSL.cmake
index f22fe32c994..d184215ac9f 100644
--- a/build_files/cmake/Modules/FindOSL.cmake
+++ b/build_files/cmake/Modules/FindOSL.cmake
@@ -95,7 +95,7 @@ IF(OSL_FOUND)
          "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR})
   STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*"
          "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR})
-ENDIF(OSL_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   OSL_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
index cc940b76382..00898923fbd 100644
--- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake
+++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
@@ -129,7 +129,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA  DEFAULT_MSG
 IF(OPENCOLLADA_FOUND)
   SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES})
   SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES})
-ENDIF(OPENCOLLADA_FOUND)
+ENDIF()
 
 UNSET(COMPONENT)
 UNSET(UPPERCOMPONENT)
diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake
index 559ccaba865..5c0ad89a0b7 100644
--- a/build_files/cmake/Modules/FindOpenColorIO.cmake
+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake
@@ -70,7 +70,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO DEFAULT_MSG
 IF(OPENCOLORIO_FOUND)
   SET(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES})
   SET(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_INCLUDE_DIR})
-ENDIF(OPENCOLORIO_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   OPENCOLORIO_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake
index ddd98237dd0..94c175dcb0f 100644
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -65,7 +65,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenJPEG DEFAULT_MSG
 IF(OPENJPEG_FOUND)
   SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
   SET(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR})
-ENDIF(OPENJPEG_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   OPENJPEG_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake
index 312540645dc..ec52b9e0310 100644
--- a/build_files/cmake/Modules/FindOpenSubdiv.cmake
+++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake
@@ -90,7 +90,7 @@ IF(OPENSUBDIV_FOUND)
   OPENSUBDIV_CHECK_CONTROLLER("cudaEvaluator.h" OPENSUBDIV_HAS_CUDA)
   OPENSUBDIV_CHECK_CONTROLLER("glXFBEvaluator.h" OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK)
   OPENSUBDIV_CHECK_CONTROLLER("glComputeEvaluator.h" OPENSUBDIV_HAS_GLSL_COMPUTE)
-ENDIF(OPENSUBDIV_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   OPENSUBDIV_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake
index 1c7d955d1d4..3d135d7c87b 100644
--- a/build_files/cmake/Modules/FindOpenVDB.cmake
+++ b/build_files/cmake/Modules/FindOpenVDB.cmake
@@ -55,7 +55,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG
 IF(OPENVDB_FOUND)
   SET(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY})
   SET(OPENVDB_INCLUDE_DIRS ${OPENVDB_INCLUDE_DIR})
-ENDIF(OPENVDB_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(
   OPENVDB_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindOptiX.cmake 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list