[Bf-blender-cvs] [408a8edf89d] master: Cleanup: remove unnecessary argument to else() in CMake
Campbell Barton
noreply at git.blender.org
Tue Sep 27 00:50:12 CEST 2022
Commit: 408a8edf89dc4d2601e39bf5316aecd5643c185c
Author: Campbell Barton
Date: Tue Sep 27 08:42:52 2022 +1000
Branches: master
https://developer.blender.org/rB408a8edf89dc4d2601e39bf5316aecd5643c185c
Cleanup: remove unnecessary argument to else() in CMake
We have moved away from duplicating arguments in else() and endif()
commands.
===================================================================
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/jpeg.cmake
M build_files/build_environment/cmake/options.cmake
M build_files/cmake/packaging.cmake
===================================================================
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()
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 2f2e90dc934..f178317fc36 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()
More information about the Bf-blender-cvs
mailing list