Empty CMake elses & endifs parentheses

to make it more flexible the next time a value in the if's parentheses
gets changed again, and also to reduce duplicate pattern matches when
grepping those CMake files with certain keywords.

11 files changed, 31 insertions, 31 deletions

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 74bb5c9355..b1970fba35 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -61,7 +61,7 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llrender)
 add_subdirectory(${LIBS_OPEN_PREFIX}llfilesystem)
 if (NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwebrtc)
-endif (NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+endif ()
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 5868d41849..b301819536 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -23,15 +23,15 @@ use_prebuilt_binary(curl)
           -output libcurl.a
         WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
         )
-    endif (NOT ${curl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES})
-  endif (DARWIN)
+    endif ()
+  endif ()
 elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/curl_installed OR NOT ${curl_installed} EQUAL 0)
   if (NOT EXISTS ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz)
     file(DOWNLOAD
       https://github.com/secondlife/3p-curl/archive/refs/tags/v7.54.1-r1.tar.gz
       ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz
       )
-  endif (NOT EXISTS ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz)
+  endif ()
   file(ARCHIVE_EXTRACT
     INPUT ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
@@ -55,7 +55,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     execute_process(COMMAND sudo mv /usr/lib/libcrypto.so /usr/lib/libcrypto.so.3)
     execute_process(COMMAND sudo mv /usr/lib/libssl.a /usr/lib/libssl.a.3)
     execute_process(COMMAND sudo mv /usr/lib/libssl.so /usr/lib/libssl.so.3)
-  endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+  endif ()
   set(ENV{CFLAGS} "-std=c90")
   execute_process(
     COMMAND ./configure --disable-alt-svc --disable-dict --disable-doh --disable-file --disable-gopher --disable-headers-api --disable-hsts --disable-imap --disable-ldap --disable-ldaps --disable-libcurl-option --disable-manual --disable-mqtt --disable-ntlm --disable-ntlm-wb --disable-pop3 --disable-rtsp --disable-shared --disable-smb --disable-smtp --disable-sspi --disable-telnet --disable-tftp --disable-tls-srp --disable-unix-sockets --disable-verbose --disable-versioned-symbols --enable-threaded-resolver --with-ssl=${LIBS_PREBUILT_DIR} --without-libidn2 --without-libpsl --without-libssh2 --prefix=${LIBS_PREBUILT_DIR} --libdir=${ARCH_PREBUILT_DIRS_RELEASE}
@@ -78,7 +78,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     execute_process(COMMAND sudo mv /usr/lib/libssl.a.3 /usr/lib/libssl.a)
     execute_process(COMMAND sudo mv /usr/lib/libssl.so.3 /usr/lib/libssl.so)
     message("OpenSSL3 header directory and library names have been restored.")
-  endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+  endif ()
   file(REMOVE
     ${ARCH_PREBUILT_DIRS}/libcrypto.a
     ${ARCH_PREBUILT_DIRS}/libssl.a
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 4ed9f94caf..fb4734fe7b 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -62,7 +62,7 @@ if (USE_FMODSTUDIO)
           RESULT_VARIABLE fmodstudio_installed
           )
         file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "${fmodstudio_installed}")
-      else (DARWIN)
+      else ()
         file(ARCHIVE_EXTRACT
           INPUT $ENV{HOME}/Downloads/fmodstudioapi20228linux.tar.gz
           DESTINATION ${CMAKE_BINARY_DIR}
@@ -97,9 +97,9 @@ if (USE_FMODSTUDIO)
             DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
-        endif (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
+        endif ()
         file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "0")
-      endif (DARWIN)
+      endif ()
     endif ()
 
     #use_prebuilt_binary(fmodstudio)
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index 24be3a256d..4b428e4b83 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -19,7 +19,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
       https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.21.tar.gz
       ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
       )
-  endif (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz)
+  endif ()
   file(ARCHIVE_EXTRACT
     INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
@@ -44,7 +44,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
       OUTPUT_VARIABLE meshoptimizer_installed
       )
     file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
-  endif (${MESHOPTIMIZER_RESULT})
+  endif ()
 endif ()
 
 if (WINDOWS)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 4e93c1f9ca..d6e5e53ac9 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -40,7 +40,7 @@ if (NDOF)
           DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
           )
         file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
-      endif (${LIBNDOFDEV_RESULT})
+      endif ()
     endif ()
   elseif (LINUX)
     use_prebuilt_binary(open-libndofdev)
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 6b65145174..781298afbd 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -13,7 +13,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
       https://github.com/secondlife/3p-openjpeg/archive/refs/tags/v2.5.0.ea12248.tar.gz
       ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248.tar.gz
       )
-  endif (NOT EXISTS ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248.tar.gz)
+  endif ()
   file(ARCHIVE_EXTRACT
     INPUT ${CMAKE_BINARY_DIR}/3p-openjpeg-2.5.0.ea12248.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
@@ -51,7 +51,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
       DESTINATION ${LIBS_PREBUILT_DIR}/include/openjpeg
       )
     file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}")
-  endif (${OPENJPEG_RESULT})
+  endif ()
 endif ()
 
 target_link_libraries(ll::openjpeg INTERFACE openjp2 )
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index ecc9e30ac3..7cb59b04c3 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -23,7 +23,7 @@ use_prebuilt_binary(openssl)
           -output libcrypto.a
         WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
         )
-    endif (NOT ${crypto_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES})
+    endif ()
     execute_process(
       COMMAND lipo -archs libssl.a
       WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
@@ -38,8 +38,8 @@ use_prebuilt_binary(openssl)
           -output libssl.a
         WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
         )
-    endif (NOT ${ssl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES})
-  endif (DARWIN)
+    endif ()
+  endif ()
 elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/openssl_installed OR NOT ${openssl_installed} EQUAL 0)
   if (NOT EXISTS ${CMAKE_BINARY_DIR}/OpenSSL_1_1_1w.tar.gz)
     file(DOWNLOAD
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index f1cde54807..ada5b6da3b 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -27,7 +27,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
           ll::gio
   )
 
-endif (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+endif ()
 if( WINDOWS )
   target_link_libraries( ll::uilibraries INTERFACE
           opengl32
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index d8b94d5fba..4ab69e30aa 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -1,12 +1,12 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT (WINDOWS OR DARWIN))
+if (NOT (DARWIN OR WINDOWS))
   add_library( ll::fontconfig INTERFACE IMPORTED )
 
   find_package(Fontconfig REQUIRED)
   target_link_libraries( ll::fontconfig INTERFACE  Fontconfig::Fontconfig )
-endif (NOT (WINDOWS OR DARWIN))
+endif ()
 
 if (FALSE)
 if( NOT USE_CONAN )
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 07f6eb95e0..ac35bec368 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -293,11 +293,11 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES aarc
         https://raw.githubusercontent.com/DLTcollab/sse2neon/master/sse2neon.h
         ${LIBS_PREBUILT_DIR}/include/sse2neon/sse2neon.h
         )
-    endif (NOT EXISTS ${LIBS_PREBUILT_DIR}/include/sse2neon/sse2neon.h)
+    endif ()
     file(WRITE ${PREBUILD_TRACKING_DIR}/sse2neon_installed "0")
-  endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/sse2neon_installed OR NOT ${sse2neon_installed} EQUAL 0)
+  endif ()
   target_include_directories(llcommon PUBLIC ${LIBS_PREBUILT_DIR}/include/sse2neon)
-endif (CMAKE_OSX_ARCHITECTURES MATCHES arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
+endif ()
 
 if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
   target_include_directories(llcommon PUBLIC ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 69b9022ddc..1b0cb9843d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -50,7 +50,7 @@ include(LLPrimitive)
 if (ENABLE_MEDIA_PLUGINS)
     include(LibVLCPlugin)
     include(CEFPlugin)
-endif (ENABLE_MEDIA_PLUGINS)
+endif ()
 
 if (NOT HAVOK_TPV)
    # When using HAVOK_TPV, the library is precompiled, so no need for this
@@ -745,7 +745,7 @@ set(viewer_SOURCE_FILES
 
 if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
     list(REMOVE_ITEM viewer_SOURCE_FILES llvoicewebrtc.cpp)
-endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+endif ()
 
 set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING
     "The name of the viewer executable to create.")
@@ -2016,14 +2016,14 @@ target_link_libraries(${VIEWER_BINARY_NAME}
 
 if (NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
    target_link_libraries(${VIEWER_BINARY_NAME} llwebrtc )
-endif (NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+endif ()
 
 if (ENABLE_MEDIA_PLUGINS)
    target_link_libraries(${VIEWER_BINARY_NAME} ll::libvlc )
    if (DARWIN OR LINUX)
       target_link_libraries(${VIEWER_BINARY_NAME} ll::cef )
-   endif (DARWIN OR LINUX)
-endif (ENABLE_MEDIA_PLUGINS)
+   endif ()
+endif ()
 
 if( TARGET ll::intel_memops )
    target_link_libraries(${VIEWER_BINARY_NAME} ll::intel_memops )
@@ -2324,7 +2324,7 @@ if (LINUX)
     set(CPACK_FREEBSD_PACKAGE_DEPS
       "audio/freealut;graphics/libGLU;textproc/hunspell;misc/meshoptimizer;archivers/minizip;www/libnghttp2;multimedia/vlc;audio/libvorbis"
       CACHE STRING "FreeBSD package dependencies.")
-  endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD AND PACKAGE)
+  endif ()
 endif (LINUX)
 
 if (DARWIN)
@@ -2401,9 +2401,9 @@ if (DARWIN)
     )
   endif ()
 
- if (ENABLE_MEDIA_PLUGINS)
+  if (ENABLE_MEDIA_PLUGINS)
   add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef)
- endif ()
+  endif ()
 
   if (ENABLE_SIGNING)
       set(SIGNING_SETTING "--signature=${SIGNING_IDENTITY}")