diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-27 01:42:52 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-27 01:49:51 +0300 |
| commit | 408a8edf89dc4d2601e39bf5316aecd5643c185c (patch) | |
| tree | d0ae6175b22d3d30ca9530648e618bc5e28d3c71 /build_files/build_environment | |
| parent | b77ad0c82da6ec0ba886e7e3f965371de29f6d8d (diff) | |
Cleanup: remove unnecessary argument to else() in CMake
We have moved away from duplicating arguments in else() and endif()
commands.
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/jpeg.cmake | 6 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/options.cmake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 37b25b1897e..e18c22fc4ad 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -26,7 +26,7 @@ if(WIN32) ) endif() -else(WIN32) +else() function(harvest from to) set(pattern "") 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() |