diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-27 01:42:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-11-02 16:57:15 +0300 |
| commit | 8daad7dab5224bb241c81d4b6fe1397d68603824 (patch) | |
| tree | dabe828568e84613ad425446140f43d7c15098c6 | |
| parent | 2bdc9908a9a193a0102825a15c2e32ff4d25d14d (diff) | |
Cleanup: remove unnecessary argument to else() in CMake
We have moved away from duplicating arguments in else() and endif()
commands.
| -rw-r--r-- | build_files/build_environment/cmake/jpeg.cmake | 6 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/options.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/packaging.cmake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake index 39388ad466b..118785d859b 100644 --- a/build_files/build_environment/cmake/jpeg.cmake +++ b/build_files/build_environment/cmake/jpeg.cmake @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later if(WIN32) - # cmake for windows + # CMAKE for MS-Windows. set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON @@ -33,8 +33,8 @@ if(WIN32) ) endif() -else(WIN32) - # cmake for unix +else() + # CMAKE for UNIX. set(JPEG_EXTRA_ARGS -DWITH_JPEG8=ON -DENABLE_STATIC=ON diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 9015ef9ac7c..299b82f6d05 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -15,7 +15,7 @@ message("BuildMode = ${BUILD_MODE}") if(BUILD_MODE STREQUAL "Debug") set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug) -else(BUILD_MODE STREQUAL "Debug") +else() set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release) endif() diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index f6073eba82e..072f1434f6b 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -48,7 +48,7 @@ if(MSVC) else() set(PACKAGE_ARCH windows32) endif() -else(MSVC) +else() set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR}) endif() |