Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-08-09 06:36:45 +0300
committerCampbell Barton <campbell@blender.org>2022-08-09 06:37:29 +0300
commitdfbba7c0ebfb84eb5ddb86f6eb98b45c11a83436 (patch)
tree9b9f03127711ed7dde6e70389d1a2a4a3a6323f7 /build_files/cmake/platform
parent19b5524d1c0c1c2ee78a8a75b8703b7cc72a8671 (diff)
Cleanup: CMake file indentation
Diffstat (limited to 'build_files/cmake/platform')
-rw-r--r--build_files/cmake/platform/platform_unix.cmake6
-rw-r--r--build_files/cmake/platform/platform_win32.cmake40
2 files changed, 26 insertions, 20 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 406748b7ff0..0d7ed9d618c 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -803,7 +803,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
"The mold linker could not find the directory containing the linker command "
"(typically "
"\"${MOLD_PREFIX}/libexec/mold/ld\") or "
- "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker.")
+ "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker."
+ )
set(WITH_LINKER_MOLD OFF)
endif()
unset(MOLD_PREFIX)
@@ -942,7 +943,8 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED)
int main(int argc, char **argv) {
std::atomic<uint64_t> uint64; uint64++;
return 0;
- }")
+ }"
+ )
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITHOUT_LIBATOMIC)
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 7e272ea26b0..e81582f0460 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -146,7 +146,7 @@ endif()
if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828)
#set a flag so we don't have to do this comparison all the time
- SET(MSVC_ASAN ON)
+ set(MSVC_ASAN ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address")
string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
@@ -185,20 +185,20 @@ endif()
if(WITH_WINDOWS_SCCACHE)
- set(CMAKE_C_COMPILER_LAUNCHER sccache)
- set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
+ set(CMAKE_C_COMPILER_LAUNCHER sccache)
+ set(CMAKE_CXX_COMPILER_LAUNCHER sccache)
+ set(SYMBOL_FORMAT /Z7)
+ set(SYMBOL_FORMAT_RELEASE /Z7)
+else()
+ unset(CMAKE_C_COMPILER_LAUNCHER)
+ unset(CMAKE_CXX_COMPILER_LAUNCHER)
+ if(MSVC_ASAN)
set(SYMBOL_FORMAT /Z7)
set(SYMBOL_FORMAT_RELEASE /Z7)
-else()
- unset(CMAKE_C_COMPILER_LAUNCHER)
- unset(CMAKE_CXX_COMPILER_LAUNCHER)
- if(MSVC_ASAN)
- set(SYMBOL_FORMAT /Z7)
- set(SYMBOL_FORMAT_RELEASE /Z7)
- else()
- set(SYMBOL_FORMAT /ZI)
- set(SYMBOL_FORMAT_RELEASE /Zi)
- endif()
+ else()
+ set(SYMBOL_FORMAT /ZI)
+ set(SYMBOL_FORMAT_RELEASE /Zi)
+ endif()
endif()
if(WITH_WINDOWS_PDB)
@@ -416,7 +416,7 @@ if(WITH_CODEC_FFMPEG)
${LIBDIR}/ffmpeg/lib/avdevice.lib
${LIBDIR}/ffmpeg/lib/avutil.lib
${LIBDIR}/ffmpeg/lib/swscale.lib
- )
+ )
endif()
endif()
@@ -565,12 +565,14 @@ if(WITH_BOOST)
if(WITH_CYCLES AND WITH_CYCLES_OSL)
set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX}
- debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX})
+ debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX}
+ )
endif()
if(WITH_INTERNATIONAL)
set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
optimized ${BOOST_LIBPATH}/libboost_locale-${BOOST_POSTFIX}
- debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX})
+ debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX}
+ )
endif()
else() # we found boost using find_package
set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -677,7 +679,8 @@ if(WITH_OPENIMAGEDENOISE)
optimized ${OPENIMAGEDENOISE_LIBPATH}/dnnl.lib
debug ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise_d.lib
debug ${OPENIMAGEDENOISE_LIBPATH}/common_d.lib
- debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib)
+ debug ${OPENIMAGEDENOISE_LIBPATH}/dnnl_d.lib
+ )
set(OPENIMAGEDENOISE_DEFINITIONS)
endif()
@@ -832,7 +835,8 @@ if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
debug ${LIBDIR}/embree/lib/math_d.lib
debug ${LIBDIR}/embree/lib/simd_d.lib
debug ${LIBDIR}/embree/lib/sys_d.lib
- debug ${LIBDIR}/embree/lib/tasking_d.lib)
+ debug ${LIBDIR}/embree/lib/tasking_d.lib
+ )
endif()
endif()