[Bf-blender-cvs] [137eae06ade] tmp-libs-2.93-lts: Cleanup: remove unnecessary argument to else() in CMake
Campbell Barton
noreply at git.blender.org
Thu Nov 24 17:29:51 CET 2022
Commit: 137eae06ade5a4e320329d343a1ed19cbbe3e1c7
Author: Campbell Barton
Date: Tue Sep 27 08:42:52 2022 +1000
Branches: tmp-libs-2.93-lts
https://developer.blender.org/rB137eae06ade5a4e320329d343a1ed19cbbe3e1c7
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/jpeg.cmake
M build_files/build_environment/cmake/options.cmake
M build_files/cmake/packaging.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake
index d9eca5ed5cd..7f52f9a8e8c 100644
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -41,7 +41,7 @@ if(WIN32)
else()
set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
endif()
-else(WIN32)
+else()
# cmake for unix
set(JPEG_EXTRA_ARGS
-DWITH_JPEG8=ON
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 486b3d1a802..b9a2e8d259d 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -32,7 +32,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 4a0a4f2493d..a8c17754f90 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -46,7 +46,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